David S. Miller
67ddc87f16
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/mwifiex/pcie.c
net/ipv6/sit.c
The SIT driver conflict consists of a bug fix being done by hand
in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper
was created (netdev_alloc_pcpu_stats()) which takes care of this.
The two wireless conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-05 20:32:02 -05:00
2014-03-05 20:32:02 -05:00
2013-07-03 16:08:06 -07:00
2014-01-24 15:51:02 -08:00
2013-09-11 15:59:28 -07:00
2014-02-10 16:01:40 -08:00
2013-11-05 17:23:52 +00:00
2013-11-13 12:09:14 +09:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2014-01-30 16:56:55 -08:00
2014-01-31 09:31:14 -08:00
2013-10-02 16:03:51 -04:00
2013-05-21 10:21:57 -07:00
2014-01-17 02:00:45 +01:00
2013-10-30 01:21:24 +01:00
2013-07-03 16:07:42 -07:00
2013-07-25 12:37:24 +02:00
2014-01-16 13:44:11 -05:00
2014-03-05 20:32:02 -05:00
2014-01-31 09:31:14 -08:00
2014-01-22 21:21:55 -08:00
2014-02-04 06:34:21 -02:00
2013-08-20 12:47:28 +02:00
2013-04-12 14:06:16 +10:00
2014-01-07 11:54:28 +09:00
2012-11-19 14:28:24 +01:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2012-11-14 15:07:18 -08:00
2013-08-27 10:50:52 +02:00
2013-12-12 19:33:59 +01:00
2013-07-31 10:33:05 +02:00
2014-01-29 20:40:08 +01:00
2014-02-15 19:46:34 +01:00
2013-04-02 09:39:55 -07:00
2014-02-10 16:01:40 -08:00
2013-12-18 08:47:43 -08:00
2014-01-24 09:40:59 +01:00
2013-12-10 23:09:08 -08:00
2013-10-08 23:51:50 +02:00
2013-07-04 11:40:58 -07:00
2014-01-08 15:32:51 -08:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2013-05-28 12:02:12 +02:00
2013-11-27 11:03:38 -08:00
2014-01-29 18:56:27 -08:00
2013-03-22 12:10:42 -04:00
2014-01-03 11:22:09 -08:00
2013-01-26 22:20:06 -08:00
2014-03-05 20:32:02 -05:00
2013-01-10 01:27:46 +01:00
2013-07-09 22:09:19 +02:00
2014-02-13 10:48:02 -07:00
2014-02-10 16:01:40 -08:00
2013-08-27 14:44:27 +10:00
2013-09-26 09:45:40 -07:00
2014-02-04 20:26:46 -08:00
2013-07-25 12:34:15 +02:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2014-01-03 07:42:59 -05:00
2014-02-10 16:01:40 -08:00
2014-01-07 17:56:32 +00:00
2014-02-12 09:11:24 -08:00
2014-01-31 08:59:46 -08:00
2013-10-16 13:35:02 -07:00
2013-09-03 09:10:24 -04:00
2014-02-10 16:01:40 -08:00
2013-08-09 10:57:06 -04:00
2014-01-23 16:36:52 -08:00
2014-01-10 15:33:54 +01:00
2013-12-20 13:41:36 -02:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2014-02-10 16:01:40 -08:00
2013-07-11 21:47:58 +02:00
2014-02-10 16:01:40 -08:00
2014-01-15 00:25:14 +04:00
2014-02-07 15:24:31 -08:00
2014-02-10 16:01:40 -08:00
2013-12-02 11:24:18 +00:00
2013-01-08 14:14:55 -08:00
2013-07-04 11:40:58 -07:00
2013-08-20 12:46:52 +02:00
2013-11-27 20:34:32 -08:00
2013-12-03 10:08:57 -08:00
2014-01-16 12:00:57 -08:00
2013-07-03 22:58:20 +02:00
2013-07-03 16:08:01 -07:00
2014-01-23 16:37:01 -08:00
2013-09-04 12:59:47 +02:00
2014-01-20 01:11:13 +01:00
2013-12-19 10:17:11 -07:00
2013-09-17 15:32:37 +01:00
2013-09-17 15:32:37 +01:00
2013-10-14 15:50:53 +02:00
2013-09-10 11:36:45 +05:30
2013-11-14 11:04:40 -08:00
2012-11-19 14:10:53 +01:00
2014-01-23 16:36:55 -08:00
2013-12-19 15:09:14 +01:00
2013-12-02 14:48:28 +01:00
2013-11-13 12:09:34 +09:00
2013-12-10 23:09:08 -08:00
2013-03-10 18:16:36 +08:00
2013-08-27 10:46:02 +02:00
2013-01-11 11:38:03 -08:00
2013-12-02 14:48:28 +01:00
2013-04-29 15:18:50 +02:00
2013-02-27 19:10:21 -08:00
2013-08-20 12:59:18 +02:00
2013-12-02 14:48:28 +01:00
2013-05-28 12:02:11 +02:00
2014-02-06 13:48:51 -08:00
2013-09-25 06:49:46 -07:00
2013-08-27 10:47:05 +02:00
2013-12-07 21:20:11 -08:00
2012-11-28 18:36:06 +10:00
2013-10-09 08:19:08 +02:00
2013-01-31 19:20:33 -05:00
2013-12-02 14:45:19 +01:00
2013-07-13 12:09:57 -07:00
2014-01-12 10:37:13 +01:00
2013-09-06 09:36:28 -07:00
2013-12-13 15:59:11 +00:00
2013-11-11 12:41:33 +01:00
2014-02-05 05:48:43 +00:00
2014-01-15 13:59:50 +01:00
2014-01-23 16:36:56 -08:00
2013-10-24 10:51:33 +02:00
2013-12-02 14:45:19 +01:00
2013-11-30 14:08:28 +01:00
2013-01-03 15:57:16 -08:00
2013-12-02 14:45:19 +01:00
2013-07-03 16:07:54 -07:00
2012-12-17 17:15:23 -08:00
2013-06-19 12:58:42 +02:00
2013-12-02 14:45:19 +01:00
2013-06-03 14:20:18 -07:00
2013-08-20 12:58:15 +02:00
2013-07-25 12:34:15 +02:00
2013-10-16 13:01:44 -07:00
2013-04-04 10:24:53 -07:00
2013-12-06 16:37:43 -05:00
2013-09-05 16:36:21 -06:00
2013-12-03 11:15:58 -08:00
2013-08-21 10:32:09 -04:00
2013-06-26 12:10:56 +02:00
2013-11-26 11:09:08 +01:00
67ddc87f16
