mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 14:43:03 +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
|
||
---|---|---|
.. | ||
af_phonet.c | ||
datagram.c | ||
Kconfig | ||
Makefile | ||
pep-gprs.c | ||
pep.c | ||
pn_dev.c | ||
pn_netlink.c | ||
socket.c | ||
sysctl.c |