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
..
benet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
Kconfig	drivers/net/ethernet/*: Enabled vendor Kconfig options	2011-08-27 00:58:56 -07:00
Makefile