David S. Miller
5f013c9bc7
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
net/sched/cls_api.c
net/sched/sch_api.c
The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces. These were simple transformations from
netlink_capable to netlink_ns_capable.
The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-12 13:19:14 -04:00
2014-04-11 13:20:04 -07: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-03-17 12:13:09 +01:00
2014-04-08 12:06:03 -07: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-04-07 16:36:02 -07:00
2014-04-07 16:35:57 -07:00
2014-02-07 15:40:17 -08:00
2014-03-20 03:50:12 +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-03-27 16:56:23 -04:00
2014-05-12 13:19:14 -04:00
2014-05-02 13:47:50 -04:00
2014-05-02 16:16:26 -04:00
2014-03-11 06:55:49 -03:00
2013-08-20 12:47:28 +02:00
2014-01-07 11:54:28 +09:00
2014-02-10 16:01:40 -08:00
2014-04-12 14:49:50 -07:00
2014-02-28 15:12:08 -08:00
2014-02-07 09:47:02 +01:00
2014-04-01 18:27:33 +02:00
2014-04-05 18:45:11 -07:00
2014-04-06 13:53:48 +02:00
2014-02-10 16:01:40 -08:00
2014-03-21 13:16:58 +01:00
2014-01-24 09:40:59 +01:00
2014-04-16 14:13:27 -07:00
2014-04-07 16:36:09 -07: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-11-27 11:03:38 -08:00
2014-01-29 18:56:27 -08:00
2014-01-03 11:22:09 -08:00
2014-05-04 19:40:00 -04:00
2013-07-09 22:09:19 +02:00
2014-02-20 14:32:34 -07:00
2014-03-08 12:39:44 +05:30
2014-04-02 16:23:38 -07:00
2013-08-27 14:44:27 +10:00
2013-09-26 09:45:40 -07:00
2014-03-27 14:51:47 -04:00
2014-04-07 16:36:07 -07:00
2014-02-17 14:56:10 -08:00
2014-02-10 16:01:40 -08:00
2014-04-07 16:36:11 -07:00
2014-03-15 10:19:21 -07:00
2014-03-21 13:16:58 +01:00
2014-04-16 14:20:34 -07:00
2014-02-27 08:07:39 -08:00
2014-03-30 00:51:34 +00:00
2014-04-07 16:36:07 -07: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-04-03 10:26:31 -07:00
2014-03-21 13:16:58 +01:00
2014-03-14 10:37:43 -03:00
2014-04-02 16:23:38 -07:00
2014-04-18 16:40:08 -07:00
2014-02-18 08:09:40 -08:00
2014-03-31 13:33:55 +02:00
2014-03-13 15:32:42 -07:00
2014-01-15 00:25:14 +04:00
2014-04-18 16:59:52 -07:00
2014-04-02 13:15:58 -07:00
2013-12-02 11:24:18 +00: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-03-19 14:56:06 -07:00
2013-07-03 22:58:20 +02:00
2013-07-03 16:08:01 -07:00
2014-03-20 13:43:40 +01:00
2013-09-04 12:59:47 +02:00
2014-01-20 01:11:13 +01:00
2014-04-04 09:50:07 -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
2014-04-09 13:44:34 -07:00
2014-01-23 16:36:55 -08:00
2014-02-07 08:03:07 -02:00
2013-12-19 15:09:14 +01:00
2013-12-02 14:48:28 +01:00
2014-03-21 13:16:58 +01:00
2013-11-13 12:09:34 +09:00
2013-12-10 23:09:08 -08:00
2013-08-27 10:46:02 +02:00
2013-12-02 14:48:28 +01:00
2013-08-20 12:59:18 +02:00
2013-12-02 14:48:28 +01:00
2014-04-07 16:36:11 -07:00
2014-04-16 14:20:34 -07:00
2014-02-17 14:56:08 -08:00
2014-03-21 13:16:58 +01:00
2014-04-03 16:21:27 -07:00
2013-12-07 21:20:11 -08:00
2013-10-09 08:19:08 +02:00
2014-04-16 14:20:34 -07:00
2013-12-02 14:45:19 +01:00
2013-07-13 12:09:57 -07:00
2014-04-02 16:23:38 -07:00
2013-09-06 09:36:28 -07:00
2014-04-06 09:38:07 -07:00
2013-11-11 12:41:33 +01:00
2014-03-31 14:52:43 +10:30
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-12-02 14:45:19 +01:00
2013-07-03 16:07:54 -07:00
2014-04-16 14:13:26 -07:00
2013-12-02 14:45:19 +01:00
2014-04-03 16:21:27 -07:00
2013-07-25 12:34:15 +02:00
2013-10-16 13:01:44 -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-11-26 11:09:08 +01:00
5f013c9bc7
