]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 607bb02 30c367e)
Merge remote-tracking branch 'stefanha/net' into staging
authorAnthony Liguori <aliguori@amazon.com>
Mon, 25 Nov 2013 17:37:27 +0000 (09:37 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Mon, 25 Nov 2013 17:37:27 +0000 (09:37 -0800)
commit0ff1e1dac4b6bccefc4b8a861ec2a643ecfb6e9d
treeec3803f73d5d69c6f888ad63f65b8f34514d939etree
parent607bb022f2a44797cbf40e85e84da4134e2f0e01commit | diff
parent30c367ed446b6ea53245589a5cf373578ac075d7commit | 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>
Qemu copy for testing