forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/arch/sparc/net
History
David S. Miller 902455e007 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/core/rtnetlink.c
	net/core/skbuff.c

Both conflicts were very simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-11 16:02:55 -07:00
..
bpf_jit.h net: filter: Fix some more small issues in sparc JIT. 2012-04-17 16:43:46 -04:00
bpf_jit_asm.S net: filter: Fix some more small issues in sparc JIT. 2012-04-17 16:43:46 -04:00
bpf_jit_comp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-11 16:02:55 -07:00
Makefile