renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 23:53:55 +08:00
Code
b8cd337c8e
linux-next/arch/arm/net
History
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_32.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
bpf_jit_32.h ARM: net: support BPF_ALU | BPF_MOD instructions in the BPF JIT. 2015-10-05 07:02:42 -07:00
Makefile ARM: 7259/3: net: JIT compiler for packet filters 2012-03-24 09:38:56 +00:00