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-04-09 16:57:01 -07:00
2015-04-17 09:04:09 -04:00
2015-02-11 10:28:45 -08:00
2015-05-27 14:20:40 -04:00
2015-04-16 19:02:04 -04:00
2015-04-27 10:10:19 -07:00
2015-04-27 10:10:19 -07:00
2015-04-27 10:04:39 -07:00
2015-04-27 10:04:39 -07:00
2015-04-27 10:05:55 -07:00
2015-04-27 10:05:55 -07:00
2014-12-04 09:57:13 +01:00
2014-08-08 15:57:29 -07:00
2015-04-17 10:13:56 -07:00
2014-11-20 09:11:11 +01:00
2014-07-17 22:07:37 +02:00
2014-11-20 09:11:10 +01:00
2014-11-20 09:11:10 +01:00
2014-11-24 16:13:16 +01:00
2014-11-20 09:11:10 +01:00
2015-03-10 13:54:42 +10:30
2015-04-16 19:02:04 -04:00
2015-04-09 14:19:23 -07:00
2014-07-17 22:07:35 +02:00
2014-11-24 20:01:28 +01:00
2014-11-20 09:11:10 +01:00
2014-11-20 09:11:10 +01:00
2014-07-25 17:16:55 -04:00
2014-07-17 22:07:37 +02:00
2015-04-16 10:37:12 -07:00
2014-11-12 11:15:57 +01:00
2015-01-09 15:44:19 +01:00
2015-04-11 22:27:14 -04:00
2014-07-17 22:07:39 +02:00
2014-11-24 20:01:28 +01:00
2014-11-12 11:15:57 +01:00
2015-02-11 17:06:05 -08:00
2014-11-20 09:11:15 +01:00
2014-11-20 09:11:10 +01:00
2014-11-20 09:11:10 +01:00