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-01-27 11:07:35 +01:00
2015-01-27 11:09:13 +01:00
2015-01-27 11:09:13 +01:00
2014-11-04 13:18:21 +01:00
2014-04-09 14:49:43 +02:00
2009-07-10 15:01:49 -04:00
2015-03-30 10:48:26 +02:00
2015-05-11 19:16:04 +02:00
2014-04-29 17:59:27 +02:00
2014-04-09 14:49:43 +02:00
2014-11-04 13:18:21 +01:00
2015-04-20 13:05:29 +02:00
2015-04-20 13:05:29 +02:00
2015-03-30 10:47:56 +02:00
2013-12-18 10:33:06 +01:00
2015-05-11 14:51:29 +02:00
2012-03-13 14:54:16 -04:00