| commit | 7066098ceddd1dc04dc59c79e6c1525c0025cacd | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 13:11:29 +0000 (28 13:11 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 13:12:23 +0000 (28 13:12 +0000) | ||
| tree | fd230a652b4e2517b84e2d50355ed4791f9c01f1 | treesnapshot (tar.gz zip) |
| parent | 6e62722997947ce7cb0b641b25766a1b3565edb6 | commitdiff |
| parent | 6c9f58ba3b79202655e6156eb1dab3a2d2e0b51e | commitdiff |
Merge commit '6c9f58ba3b79202655e6156eb1dab3a2d2e0b51e' into upstream-merge
* commit '6c9f58ba3b79202655e6156eb1dab3a2d2e0b51e':
Enable UFO on virtio-net and tap devices
Conflicts:
net.c
tap-linux.h
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit '6c9f58ba3b79202655e6156eb1dab3a2d2e0b51e':
Enable UFO on virtio-net and tap devices
Conflicts:
net.c
tap-linux.h
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| net.h | diff1 | diff2 | blobhistory |