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_ethtool.c	Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers	2011-11-22 16:43:32 -05:00
e1000_hw.c	e1000: Neaten e1000_config_dsp_after_link_change	2012-02-24 02:02:13 -08:00
e1000_hw.h	e1000: Adding e1000_dump function	2012-02-07 04:01:46 -08:00
e1000_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
e1000_osdep.h	intel: Move the Intel wired LAN drivers	2011-08-10 20:03:27 -07:00
e1000_param.c	intel: Move the Intel wired LAN drivers	2011-08-10 20:03:27 -07:00
e1000.h	e1000: Adding e1000_dump function	2012-02-07 04:01:46 -08:00
Makefile	intel: Move the Intel wired LAN drivers	2011-08-10 20:03:27 -07:00