diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-11-25 09:37:27 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-25 09:37:27 -0800 |
| commit | 0ff1e1dac4b6bccefc4b8a861ec2a643ecfb6e9d (patch) | |
| tree | ec3803f73d5d69c6f888ad63f65b8f34514d939e /.gitignore | |
| parent | 607bb022f2a44797cbf40e85e84da4134e2f0e01 (diff) | |
| parent | 30c367ed446b6ea53245589a5cf373578ac075d7 (diff) | |
Merge remote-tracking branch 'stefanha/net' into staging
# By Vlad Yasevich
# Via Stefan Hajnoczi
* stefanha/net:
qdev-properties-system.c: Allow vlan or netdev for -device, not both
Message-id: 1385118544-28482-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions