| commit | 30c5e982865a8af99aded57af49688c600131308 | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 13:13:05 +0000 (28 13:13 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 13:13:05 +0000 (28 13:13 +0000) | ||
| tree | 38f84a63dd4c26dc8d1ecd6ca7576d39f2d5549a | treesnapshot (tar.gz zip) |
| parent | 7066098ceddd1dc04dc59c79e6c1525c0025cacd | commitdiff |
| parent | 9f09204064f7df627361e0dfc1f0e86f106de8e9 | commitdiff |
Merge commit '9f09204064f7df627361e0dfc1f0e86f106de8e9' into upstream-merge
* commit '9f09204064f7df627361e0dfc1f0e86f106de8e9':
really fix net.h
Fix signature of new_vlan_client
virtio-net: add tap_has_ufo flag to saved state
Conflicts:
net.h
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit '9f09204064f7df627361e0dfc1f0e86f106de8e9':
really fix net.h
Fix signature of new_vlan_client
virtio-net: add tap_has_ufo flag to saved state
Conflicts:
net.h
Signed-off-by: Mark McLoughlin <markmc@redhat.com>