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

can: fix assignment of error location in CAN error messages

2015-11-23 09:37:34 +01:00

ifi_canfd

net: can: ifi: Configure transmitter delay

2016-09-21 10:32:24 +02:00

m_can

can: fix handling of unmodifiable configuration options

2016-05-09 11:07:28 +02:00

mscan

treewide: replace dev->trans_start update with helper

2016-05-04 14:16:49 -04:00

rcar

can: rcar_canfd: Add back-to-error-active support

2016-06-23 11:23:49 +02:00

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

can: mcp251x: add message about sucessful/unsuccessful probe

2016-06-23 11:23:49 +02:00

usb

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-12-10 16:21:55 -05:00

at91_can.c

can: at91_can: RX queue could get stuck at high bus load

2016-06-20 09:32:40 +02:00

bfin_can.c

can: remove obsolete assignment for CAN protocol error type

2015-11-23 09:37:38 +01:00

dev.c

can: dev: add CAN interface API for fixed bitrates

2017-01-24 13:52:00 +01:00

flexcan.c

can: flexcan: fix resume function

2016-09-19 16:09:05 +02:00

grcan.c

docs: fix locations of several documents that got moved

2016-10-24 08:12:35 -02:00

janz-ican3.c

can: janz-ican3: error handling for CAL/CANopen firmware

2016-05-09 11:07:28 +02:00

Kconfig

can: rcar_can: Move Renesas CAN driver to rcar dir

2016-06-17 15:39:48 +02:00

led.c

can: add combined rx/tx LED trigger support

2015-03-22 23:50:11 +01:00

Makefile

Makefile: drop -D__CHECK_ENDIAN__ from cflags

2016-12-16 00:13:43 +02:00

pch_can.c

can: fix assignment of error location in CAN error messages

2015-11-23 09:37:34 +01:00

slcan.c

can: slcan: Replace sizeof struct can_frame with CAN_MTU

2016-06-17 15:39:42 +02:00

sun4i_can.c

can: remove obsolete assignment for CAN protocol error type

2015-11-23 09:37:38 +01:00

ti_hecc.c

can: ti_hecc: add missing prepare and unprepare of the clock

2017-01-18 13:03:15 +01:00

vcan.c

can: replace timestamp as unique skb attribute

2015-07-12 21:13:22 +02:00

xilinx_can.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-03 21:09:12 -05:00