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