tree 34c3a633000e03bca57d0ce55d8759f86edecc03
parent 51ee42efa0829cf9e46f8e1c0ab7a9ab6facf3f2
parent 1a466ae96e9f749d02a73315a3e66375e61a61dd
author David S. Miller <davem@davemloft.net> 1399915154 -0400
committer David S. Miller <davem@davemloft.net> 1399915154 -0400

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>