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-11 22:28:27 -04:00
2015-04-09 08:36:54 +03:00
2015-02-20 17:35:14 -05:00
2015-05-26 18:41:17 +02:00
2015-05-31 00:02:30 -07:00
2015-04-06 00:19:05 +02:00
2015-05-27 14:15:26 -04:00
2015-03-20 19:10:44 -04:00
2015-05-04 14:49:23 -04:00
2015-05-11 10:50:17 -04:00
2015-03-04 00:23:23 -05:00
2015-03-03 14:44:41 -05:00
2015-02-24 16:05:48 -05:00
2015-05-11 10:59:32 -04:00
2015-05-11 10:59:32 -04:00
2015-05-26 15:21:27 +02:00
2015-05-27 19:29:42 +02:00
2015-05-17 13:08:29 -04:00
2015-02-11 14:46:37 -05:00
2015-05-13 14:31:43 -04:00
2015-04-09 00:02:26 -04:00
2015-03-06 21:50:02 -05:00
2015-04-07 15:25:55 -04:00
2015-03-29 13:23:54 -07:00
2015-03-09 16:06:10 -04:00
2015-05-12 23:19:49 -04:00
2015-03-12 14:39:40 -04:00
2015-05-13 15:19:47 -04:00
2015-03-12 14:39:40 -04:00
2015-05-13 15:59:13 -04:00
2015-05-26 20:26:09 +02:00
2015-03-23 22:12:09 -04:00
2015-03-20 12:40:25 -04:00
2015-03-18 22:00:35 -04:00
2015-05-11 10:50:18 -04:00
2015-05-31 21:49:14 -07:00
2015-05-27 13:03:31 -04:00
2015-05-26 19:48:46 -04:00
2015-03-17 22:02:29 -04:00
2015-04-13 16:40:05 -04:00
2015-03-31 13:58:35 -04:00
2015-05-25 13:25:35 -04:00
2015-05-25 13:25:34 -04:00
2015-04-07 15:29:08 -04:00
2015-03-11 16:22:14 -04:00
2015-04-02 14:05:00 -04:00
2015-03-12 14:39:40 -04:00
2015-05-27 13:03:31 -04:00
2015-05-25 20:27:11 -04:00
2015-02-28 21:31:12 +01:00
2015-05-11 10:50:17 -04:00
2015-05-28 14:37:43 +02:00
2015-05-19 11:44:42 +02:00
2015-03-04 00:23:23 -05:00
2015-03-20 21:47:40 -04:00
2015-05-17 23:41:11 -04:00
2015-03-31 13:58:35 -04:00
2015-05-19 11:44:44 +02:00
2015-03-02 13:06:31 -05:00
2015-05-05 16:02:34 -04:00
2015-04-10 12:42:40 -07:00
2015-05-13 15:08:14 -04:00
2015-05-21 16:56:40 -04:00
2015-05-17 22:49:09 -04:00
2015-03-12 22:58:12 -04:00
2015-05-19 16:53:37 -04:00
2015-04-07 15:29:08 -04:00
2015-03-02 13:06:31 -05:00
2015-02-04 01:34:15 -05:00
2015-04-07 15:29:08 -04:00
2015-04-07 15:25:55 -04:00
dda922c831