aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-22 01:23:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
c378b5119eb0ea25bfd3348a06b51fca654d9903
lkl_linux/drivers/net/ethernet/arc/emac_main.c
David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-23 12:09:27 -04:00

22 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink