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
..
Kconfig
Makefile
mv643xx_eth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-06 15:06:41 -07:00
pxa168_eth.c	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
skge.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-10 23:32:28 -05:00
skge.h
sky2.c	sky2: fix checksum bit management on some chips	2012-06-07 13:06:42 -07:00
sky2.h	sky2: fix receive length error in mixed non-VLAN/VLAN traffic	2012-05-01 13:39:13 -04:00