David S. Miller 7cda4cee13 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Small overlapping change conflict ('net' changed a line, 'net-next' added a line right afterwards) in flexcan.c Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-05 10:44:19 -05:00
..
c_can	can: c_can_pci: make c_can_pci_data const	2017-12-01 09:14:22 +01:00
cc770
ifi_canfd	can: ifi: Fix transmitter delay calculation	2017-11-10 11:35:09 +01:00
m_can
mscan
peak_canfd	can: peak/pci: fix potential bug when probe() fails	2017-12-01 11:20:52 +01:00
rcar
sja1000	can: peak/pci: fix potential bug when probe() fails	2017-12-01 11:20:52 +01:00
softing
spi
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-05 10:44:19 -05:00
at91_can.c
bfin_can.c
dev.c
flexcan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-05 10:44:19 -05:00
grcan.c
janz-ican3.c
Kconfig
led.c
Makefile
pch_can.c
rx-offload.c
slcan.c
sun4i_can.c	can: sun4i: handle overrun in RX FIFO	2017-11-10 09:15:28 +01:00
ti_hecc.c	can: ti_hecc: Fix napi poll return value for repoll	2017-12-01 11:20:52 +01:00
vcan.c
vxcan.c	can: vxcan: Use common error handling code in vxcan_newlink()	2017-12-01 09:14:22 +01:00
xilinx_can.c