Files
rockchip-kernel/include/uapi/linux
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
..
2013-04-26 16:08:16 +10:00
2014-03-20 14:55:18 +01:00
2013-11-09 18:20:22 -05:00
2012-10-16 18:49:15 -07:00
2013-03-27 14:37:47 +00: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
2013-12-11 12:57:55 -08:00
2013-08-13 15:10:22 -07:00
2013-08-21 12:21:45 -07:00
2014-02-07 15:18:31 -08:00
2013-12-08 11:01:47 +01:00
2013-11-27 11:03:38 -08:00
2014-03-04 13:51:06 -05:00
2013-07-09 10:33:25 -07:00
2013-02-27 19:10:22 -08:00
2014-01-22 10:34:15 +01:00
2013-04-19 14:57:57 -04:00
2012-11-16 10:15:35 -08:00
2014-01-06 15:13:01 -05:00
2014-03-21 14:21:13 -04:00
2013-12-06 12:37:56 -05:00
2013-03-22 16:19:59 -07:00
2014-04-26 12:13:24 -04:00
2013-05-02 13:40:15 +03:00
2013-12-11 09:25:20 -02:00
2014-03-07 08:12:37 +01:00