David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... 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		2011-11-21 13:50:33 -05:00
..
Kconfig
Makefile
mv643xx_eth.c	net: drivers: use bool type instead of double negation	2011-11-16 23:12:20 -05:00
pxa168_eth.c
skge.c	sweep the floors and convert some .get_drvinfo routines to strlcpy	2011-11-08 15:11:57 -05:00
skge.h
sky2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
sky2.h	sky2: fix hang in napi_disable	2011-11-17 21:43:57 -05:00