| commit | 137616579bc050b8cd5cf2f639683aafb5667be9 | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 15 Oct 2009 17:25:11 +0000 (15 18:25 +0100) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 15 Oct 2009 17:25:11 +0000 (15 18:25 +0100) | ||
| tree | e1110a3bea4617f95205486e847717c5020df5c5 | treesnapshot (tar.gz zip) |
| parent | b347635556272f509263dc0c3fdda6fa9f16645c | commitdiff |
| parent | 283c7c63f5c56c4d0340fb39093fb47e75cb122e | commitdiff |
Merge commit '283c7c63f5c56c4d0340fb39093fb47e75cb122e' into upstream-merge
* commit '283c7c63f5c56c4d0340fb39093fb47e75cb122e':
net: allow NICs to be connected to netdevs
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit '283c7c63f5c56c4d0340fb39093fb47e75cb122e':
net: allow NICs to be connected to netdevs
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| net.c | diff1 | diff2 | blobhistory |
| net.h | diff1 | diff2 | blobhistory |