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
..
e1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
e1000e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
igbvf	igbvf: fix the bug when initializing the igbvf	2012-04-30 18:54:31 -07:00
ixgb	intel: make wired ethernet driver message level consistent (rev2)	2012-03-27 23:29:22 -07:00
ixgbe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
ixgbevf	ixgbevf: Update version string	2012-05-03 02:38:38 -07:00
e100.c	e100: enable transmit time stamping.	2012-04-14 02:02:41 -07:00
Kconfig	ixgbe: add hwmon interface to export thermal data	2012-05-02 02:12:23 -07:00
Makefile	intel: Move the Intel wired LAN drivers	2011-08-10 20:03:27 -07:00