Files
ack-tegra/include/linux
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-03-29 16:17:10 +01:00
2015-05-30 23:35:34 -07:00
2015-04-07 11:17:34 +02:00
2015-03-25 20:28:11 -04:00
2015-04-17 09:03:53 -04:00
2015-05-04 13:09:55 -06:00
2015-04-17 08:31:12 -06:00
2015-03-11 15:56:59 -07:00
2015-03-16 21:45:54 +11:00
2015-04-03 16:18:02 +02:00
2015-05-14 17:55:51 -07:00
2015-04-14 16:49:05 -07:00
2015-03-25 11:44:52 +01:00
2015-03-31 12:04:12 +02:00
2015-05-09 22:15:31 -04:00
2015-04-23 14:36:28 -04:00
2015-03-11 17:56:28 -04:00
2015-05-27 14:19:44 -04:00
2015-04-12 21:03:31 +02:00
2015-02-24 08:44:16 +01:00
2015-03-26 18:18:20 +01:00
2015-03-11 21:55:28 -04:00
2015-04-11 15:53:35 -04:00
2015-03-25 13:28:58 +01:00
2015-05-10 19:26:37 +02:00
2015-04-11 22:29:44 -04:00
2015-03-24 09:48:14 -07:00
2015-04-15 16:35:20 -07:00