Merge commit '70783b9c9be31e98421f17327a1127021abae672' into upstream-merge
commitd3cd08a28c684ac6b17299bd1cb843d666dca780
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 12:40:35 +0000 (28 12:40 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 12:41:50 +0000 (28 12:41 +0000)
tree83026089823489b484df2bd2b87fb862c4456c23
parent8e9a53b466bd7b0cfdf873671c0aef81d7abaf36
parent70783b9c9be31e98421f17327a1127021abae672
Merge commit '70783b9c9be31e98421f17327a1127021abae672' into upstream-merge

* commit '70783b9c9be31e98421f17327a1127021abae672':
  net: add receive_raw parameter to qemu_new_vlan_client()

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
hw/virtio-net.c
net.c
net.h