David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-01-28 10:33:06 -05:00
..
c_can	can: c_can_pci: fix null-pointer-deref in c_can_start() - set device pointer	2017-01-18 12:58:26 +01:00
cc770
ifi_canfd
m_can
mscan
rcar
sja1000	can: sja1000: plx_pci: Add support for Moxa CAN devices	2016-10-31 20:48:19 +01:00
softing	can: softing_cs: ret is never non-zero, so remove non-zero check and -ENODEV return	2017-01-24 13:52:00 +01:00
spi
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-12-10 16:21:55 -05:00
at91_can.c
bfin_can.c
dev.c	can: dev: add CAN interface API for fixed bitrates	2017-01-24 13:52:00 +01:00
flexcan.c
grcan.c	docs: fix locations of several documents that got moved	2016-10-24 08:12:35 -02:00
janz-ican3.c
Kconfig
led.c
Makefile	Makefile: drop -D__CHECK_ENDIAN__ from cflags	2016-12-16 00:13:43 +02:00
pch_can.c
slcan.c
sun4i_can.c
ti_hecc.c	can: ti_hecc: add missing prepare and unprepare of the clock	2017-01-18 13:03:15 +01:00
vcan.c
xilinx_can.c