David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c The iwlwifi conflict was resolved by keeping the code added in 'net' that turns off the buggy chip feature. The MAINTAINERS conflict was merely overlapping changes, one change updated all the wireless web site URLs and the other changed some GIT trees to be Johannes's instead of John's. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-12 21:59:18 -07:00
..
bnx2x	bnx2x: Added EEE Ethtool support.	2012-06-07 13:18:54 -07:00
b44.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-26 21:55:51 -05:00
b44.h
bcm63xx_enet.c	bcm63xx-enet: fix PHY name to match MDIO bus name	2012-02-13 16:04:08 -05:00
bcm63xx_enet.h
bnx2_fw.h
bnx2.c	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
bnx2.h	bnx2: Add support for ethtool --show-channels|--set-channels	2012-02-05 22:42:00 -05:00
cnic_defs.h	cnic: Fix parity error code conflict	2012-03-21 21:57:36 -04:00
cnic_if.h	cnic: Fix parity error code conflict	2012-03-21 21:57:36 -04:00
cnic.c	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
cnic.h
Kconfig
Makefile
sb1250-mac.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
tg3.c	tg3: Apply short DMA frag workaround to 5906	2012-06-11 16:55:10 -07:00
tg3.h	tg3: use netdev_alloc_frag() API	2012-05-19 04:02:12 -04:00