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-03-07 09:18:23 +01:00
2014-03-06 09:31:43 +01:00
2014-02-27 13:51:29 +09:00
2014-01-16 17:24:11 -08:00
2014-04-02 20:53:45 -07:00
2014-04-22 21:42:27 -04:00
2014-02-14 13:42:13 -08:00
2014-02-04 09:34:33 +01:00
2014-04-22 21:42:27 -04:00
2014-03-20 14:55:18 +01:00
2014-01-21 23:46:27 -05:00
2014-01-23 16:36:55 -08:00
2014-04-22 21:27:57 -04:00
2014-03-13 19:07:42 +11:00
2014-01-17 11:12:06 +01:00
2014-04-22 21:27:57 -04:00
2014-04-01 17:08:43 +02:00
2014-04-02 15:38:50 +02:00
2014-02-07 11:23:22 +00:00
2014-04-16 14:10:36 -07:00
2014-03-14 22:20:57 -04:00
2014-04-27 19:08:06 -04:00
2014-03-31 16:24:52 -04:00
2014-01-22 17:35:50 -08:00
2014-02-27 15:59:09 -05:00
2014-02-26 15:51:01 -05:00
2014-02-26 15:51:00 -05:00
2014-04-19 22:44:13 -07:00
2014-02-07 15:18:31 -08:00
2014-03-21 13:43:00 +01:00
2014-04-03 16:21:06 -07:00
2014-02-07 15:30:34 -08:00
2014-03-04 13:51:06 -05:00
2014-01-20 14:45:33 -08:00
2014-01-20 14:44:50 -08:00
2014-01-22 10:34:15 +01:00
2014-03-31 16:09:06 -04:00
2014-02-16 23:49:53 +01:00
2014-01-23 16:36:55 -08:00
2014-04-28 18:09:59 +02:00
2014-04-10 17:11:59 -04:00
2014-01-25 11:17:34 -08:00
2014-01-23 16:36:55 -08:00
2014-02-17 07:18:19 +01:00
2014-01-23 16:36:55 -08:00
2014-04-07 16:35:52 -07:00
2014-03-21 14:21:13 -04:00
2014-01-20 14:44:17 -08:00
2014-01-16 09:27:17 +01:00
2014-01-20 14:45:25 -08:00
2014-03-03 15:58:03 -05:00
2014-02-26 17:08:40 -05:00
2014-02-14 16:09:43 -05:00
2014-01-20 14:44:05 -08:00
2014-04-26 12:13:24 -04:00
2014-04-26 12:13:24 -04:00
2014-04-01 18:27:33 +02:00
2014-02-12 15:00:34 -08:00
2014-03-04 15:38:05 -08:00
2014-04-06 11:06:37 -03:00
2014-03-13 10:26:49 -03:00
2014-02-04 10:01:28 -02:00
2014-03-11 10:05:53 -03:00
2014-02-26 11:38:37 -07:00
2014-03-28 18:08:22 -03:00
2014-04-03 16:21:06 -07:00
2014-03-07 08:12:37 +01:00
5f013c9bc7