OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/drivers/net/can
History
David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2015-12-03 21:09:12 -05:00
..
c_can can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
cc770 can: fix assignment of error location in CAN error messages 2015-11-23 09:37:34 +01:00
m_can can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
mscan
…
sja1000 can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
softing
…
spi
…
usb can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
Kconfig
…
Makefile
…
at91_can.c
…
bfin_can.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
dev.c
…
flexcan.c can: fix assignment of error location in CAN error messages 2015-11-23 09:37:34 +01:00
grcan.c
…
janz-ican3.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
led.c
…
pch_can.c can: fix assignment of error location in CAN error messages 2015-11-23 09:37:34 +01:00
rcar_can.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
slcan.c
…
sun4i_can.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
ti_hecc.c can: remove obsolete assignment for CAN protocol error type 2015-11-23 09:37:38 +01:00
vcan.c
…
xilinx_can.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-03 21:09:12 -05:00