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
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-21 13:50:33 -05:00
b44.c
b44.h
bcm63xx_enet.c
bcm63xx_enet.h
bnx2_fw.h
bnx2.c	bnx2: switch to build_skb() infrastructure	2011-11-18 02:04:47 -05:00
bnx2.h	bnx2: switch to build_skb() infrastructure	2011-11-18 02:04:47 -05:00
cnic_defs.h
cnic_if.h
cnic.c
cnic.h
Kconfig
Makefile
sb1250-mac.c	ethernet: Convert ETHER_ADDR_LEN uses to ETH_ALEN	2011-11-16 20:23:17 -05:00
tg3.c	net: Add ethtool to mii advertisment conversion helpers	2011-11-16 18:36:59 -05:00
tg3.h	tg3: Eliminate timer race with reset_task	2011-11-04 17:31:48 -04:00