proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-11-22 06:12:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
11e4770842
mirror_ubuntu-kernels/arch/x86/net
History
David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-12-10 15:48:20 -05:00
..
bpf_jit_comp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-12-10 15:48:20 -05:00
bpf_jit.S net: filter: x86: internal BPF JIT 2014-05-15 16:31:30 -04:00
Makefile net: filter: Just In Time compiler for x86-64 2011-04-27 23:05:08 -07:00