David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
bpf_jit.c	ebpf: migrate bpf_prog's flags to bitfield	2015-10-03 05:02:39 -07:00
bpf_jit.h	MIPS: BPF: Introduce BPF ASM helpers	2015-06-21 21:54:25 +02:00
bpf_jit_asm.S	MIPS: BPF: Fix load delay slots.	2015-10-02 09:48:57 +02:00
Makefile	MIPS: BPF: Introduce BPF ASM helpers	2015-06-21 21:54:25 +02:00