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
..
bpf_asm.c	filter: bpf_asm: add minimal bpf asm tool	2013-12-11 20:28:35 -05:00
bpf_dbg.c	bpf_dbg: fix wrong register usage	2014-04-30 16:12:22 -04:00
bpf_exp.l	filter: added BPF random opcode	2014-04-22 21:27:57 -04:00
bpf_exp.y	filter: added BPF random opcode	2014-04-22 21:27:57 -04:00
bpf_jit_disasm.c
Makefile	tools/net/Makefile: Define PACKAGE to fix build problems	2014-03-12 00:07:55 -04:00