mirror of
https://github.com/torvalds/linux
synced 2024-10-26 13:19:27 +00:00
11fe883936
Conflicts:
drivers/vhost/net.c
net/bridge/br_device.c
Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.
Revert the effects of net-2.6 commit
|
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
net.c | ||
vhost.c | ||
vhost.h |