]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
# 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>

Trivial merge
Qemu copy for testing