]> Git Repo - qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/net' into staging
authorAnthony Liguori <[email protected]>
Mon, 25 Nov 2013 17:37:27 +0000 (09:37 -0800)
committerAnthony Liguori <[email protected]>
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[email protected]
Signed-off-by: Anthony Liguori <[email protected]>

Trivial merge
This page took 0.023249 seconds and 4 git commands to generate.