David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-01 22:51:30 -07:00
..
2015-05-25 13:25:35 -04:00
2015-05-03 21:58:01 -04:00
2015-05-30 23:48:36 -07:00
2015-05-25 13:25:35 -04:00
2015-05-25 13:25:34 -04:00
2015-02-28 16:56:51 -05:00
2015-05-31 21:42:18 -07:00
2014-05-23 16:28:53 -04:00