| commit | e4aa828ffd2f38d185a1a1112bb4023deef50a03 | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 12:44:48 +0000 (28 12:44 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 12:44:48 +0000 (28 12:44 +0000) | ||
| tree | ea763e1a89d053ac2c945cd73e1d3dbb0813326b | treesnapshot (tar.gz zip) |
| parent | 319578676956380e8c9d4065c2173ea9e266b151 | commitdiff |
| parent | 2596774ad27bbe478829343702e896bea4c621cb | commitdiff |
Merge commit '2596774ad27bbe478829343702e896bea4c621cb' into upstream-merge
* commit '2596774ad27bbe478829343702e896bea4c621cb':
net: implement tap support for receive_raw()
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit '2596774ad27bbe478829343702e896bea4c621cb':
net: implement tap support for receive_raw()
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| net.c | diff1 | diff2 | blobhistory |