David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04: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	net: allow skb->head to be a page fragment	2012-04-30 21:35:11 -04: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	cnic: Fix parity error code conflict	2012-03-21 21:57:36 -04:00
cnic.h	cnic: Add timeout for ramrod replies.	2011-08-28 17:08:27 -04:00
Kconfig	MII: fix Kconfig dependencies for MII	2011-09-15 15:49:08 -04:00
Makefile
sb1250-mac.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
tg3.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
tg3.h	tg3: provide frags as skb head	2012-04-30 21:35:42 -04:00