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