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
..
cassini.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
cassini.h
Kconfig
Makefile
niu.c	net/niu: remove one superfluous dma mask check	2012-05-03 14:54:50 -04:00
niu.h
sunbmac.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
sunbmac.h
sungem.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
sungem.h
sunhme.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-10 14:30:45 -04:00
sunhme.h	sunhme: stop using net_device.{base_addr, irq}.	2012-04-07 11:47:03 +02:00
sunqe.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
sunqe.h
sunvnet.c	powerpc+sparc/vio: Modernize driver registration	2012-03-28 11:33:24 +11:00
sunvnet.h