David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07:00
..
c_can
cc770
ifi_canfd
m_can	can: tcan4x5x: Add tcan4x5x driver to the kernel	2019-07-24 10:31:54 +02:00
mscan
peak_canfd	can: mark expected switch fall-throughs	2019-07-25 20:09:42 -05:00
rcar	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
sja1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
softing
spi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 17:11:59 -07:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
at91_can.c	can: mark expected switch fall-throughs	2019-07-25 20:09:42 -05:00
dev.c	can: dev: call netif_carrier_off() in register_candev()	2019-07-24 11:06:39 +02:00
flexcan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
grcan.c
janz-ican3.c	net: Remove dev_err() usage after platform_get_irq()	2019-07-30 14:37:35 -07:00
Kconfig
kvaser_pciefd.c
led.c
Makefile
pch_can.c
rx-offload.c
slcan.c
sun4i_can.c	net: Remove dev_err() usage after platform_get_irq()	2019-07-30 14:37:35 -07:00
ti_hecc.c	can: ti_hecc: use timestamp based rx-offloading	2019-07-24 10:31:55 +02:00
vcan.c
vxcan.c
xilinx_can.c	can: xilinx_can: clean up indentation issue	2019-07-24 10:31:55 +02:00