tree ec3803f73d5d69c6f888ad63f65b8f34514d939e
parent 607bb022f2a44797cbf40e85e84da4134e2f0e01
parent 30c367ed446b6ea53245589a5cf373578ac075d7
author Anthony Liguori <aliguori@amazon.com> 1385401047 -0800
committer Anthony Liguori <aliguori@amazon.com> 1385401047 -0800

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>