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
..
de600.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
de600.h	de6*/dl2k/sundance: Move the D-Link drivers	2011-08-11 16:29:50 -07:00
de620.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
de620.h	de6*/dl2k/sundance: Move the D-Link drivers	2011-08-11 16:29:50 -07:00
dl2k.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
dl2k.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
Kconfig	MII: fix Kconfig dependencies for MII	2011-09-15 15:49:08 -04:00
Makefile	de6*/dl2k/sundance: Move the D-Link drivers	2011-08-11 16:29:50 -07:00
sundance.c	sundance: stop using net_device.{base_addr, irq}.	2012-04-07 11:45:24 +02:00