David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c The iwlwifi conflict was resolved by keeping the code added in 'net' that turns off the buggy chip feature. The MAINTAINERS conflict was merely overlapping changes, one change updated all the wireless web site URLs and the other changed some GIT trees to be Johannes's instead of John's. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-12 21:59:18 -07:00
..
cassini.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
cassini.h
Kconfig
Makefile
niu.c	Revert "niu: Add support for byte queue limits."	2012-06-08 00:28:16 -07: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	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
sunqe.h
sunvnet.c	drivers/net: Convert compare_ether_addr to ether_addr_equal	2012-05-10 23:33:01 -04:00
sunvnet.h