| commit | 07ee509ce8d386b603ec965804fb5eafedb31bff | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 12:54:21 +0000 (28 12:54 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 12:55:33 +0000 (28 12:55 +0000) | ||
| tree | 4cf515b1db3c1ae45e82fb880d919e57783dec09 | treesnapshot (tar.gz zip) |
| parent | e4aa828ffd2f38d185a1a1112bb4023deef50a03 | commitdiff |
| parent | 3a330134b3effa3494051763b38f12a24715d53a | commitdiff |
Merge commit '3a330134b3effa3494051763b38f12a24715d53a' into upstream-merge
* commit '3a330134b3effa3494051763b38f12a24715d53a':
virtio-net: add vnet_hdr support
Conflicts:
hw/virtio-net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit '3a330134b3effa3494051763b38f12a24715d53a':
virtio-net: add vnet_hdr support
Conflicts:
hw/virtio-net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| hw/virtio-net.c | diff1 | diff2 | blobhistory |