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
..
2014-10-09 11:35:48 +03:00
2015-03-25 15:04:57 +01:00
2014-04-30 19:49:37 +01:00
2012-10-06 03:04:57 +09:00
2014-08-06 18:01:25 -07:00
2015-02-12 18:54:15 -08:00
2015-02-12 18:54:15 -08:00
2014-05-05 09:09:14 +02:00
2014-08-08 15:57:25 -07:00
2015-02-12 18:54:15 -08:00
2015-02-24 08:44:16 +01:00
2015-02-12 18:54:15 -08:00
2012-07-30 17:25:16 -07:00
2014-06-25 17:45:43 -07:00
2015-01-21 16:28:49 +10:30
2015-02-12 18:54:16 -08:00
2015-03-23 22:12:08 -04:00
2015-02-12 18:54:16 -08:00
2015-04-16 19:02:04 -04:00
2015-02-13 21:21:41 -08:00
2013-04-29 18:28:42 -07:00