xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
This commit is contained in:
David S. Miller
2011-11-21 13:50:33 -05:00
parent f8a15af093 6fe4c6d466
commit efd0bf97de
548 changed files with 5547 additions and 4556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/Kconfig
View File

@@ -247,6 +247,8 @@ source "drivers/net/ethernet/Kconfig"
source "drivers/net/fddi/Kconfig"
source "drivers/net/hippi/Kconfig"
config NET_SB1000
tristate "General Instruments Surfboard 1000"
depends on PNP