From: Anthony Liguori <aliguori@amazon.com>
Date: Mon, 25 Nov 2013 17:37:27 +0000 (-0800)
Subject: Merge remote-tracking branch 'stefanha/net' into staging
X-Git-Tag: qemu-xen-4.5.0-rc1~326
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0ff1e1dac4b6bccefc4b8a861ec2a643ecfb6e9d;p=qemu-upstream-4.5-testing.git

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>
---

0ff1e1dac4b6bccefc4b8a861ec2a643ecfb6e9d