Merge commit 'b1c28b464d5f21805d322b67f008e114a484146d' into upstream-merge
commita033b4e653d0d694f34b24711d458df0779ed3fc
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 13:02:35 +0000 (28 13:02 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 13:06:13 +0000 (28 13:06 +0000)
tree17fe52984ae7cdab07016a384b253a1996b5760e
parent07ee509ce8d386b603ec965804fb5eafedb31bff
parentb1c28b464d5f21805d322b67f008e114a484146d
Merge commit 'b1c28b464d5f21805d322b67f008e114a484146d' into upstream-merge

* commit 'b1c28b464d5f21805d322b67f008e114a484146d':
  net: add tap_set_offload()

Conflicts:
net.c

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