Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflicts in net/mptcp/protocol.h and tools/testing/selftests/net/Makefile. In both cases code was added on both sides in the same place so just keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-10-15 12:43:21 -07:00
..
c_can	can: c_can: reg_map_{c,d}_can: mark as __maybe_unused	2020-10-06 22:44:26 +02:00
cc770	can: drivers: fix spelling mistakes	2020-09-21 10:13:16 +02:00
ifi_canfd	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
m_can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-15 12:43:21 -07:00
mscan	can: mscan: simplify clock enable/disable	2020-09-21 10:13:19 +02:00
peak_canfd	can: peak_canfd: Remove unused macros	2020-09-21 10:13:18 +02:00
rcar	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
sja1000	can: drivers: fix spelling mistakes	2020-09-21 10:13:16 +02:00
softing	can: softing: softing_card_shutdown(): add braces around empty body in an 'if' statement	2020-10-06 22:44:03 +02:00
spi	can: mcp251xfd: rename all remaining occurrence to mcp251xfd	2020-09-30 21:55:28 +02:00
usb	can: pcan_usb: add support of rxerr/txerr counters	2020-09-21 10:13:18 +02:00
Kconfig	can: slcan: update dead link	2020-09-21 10:13:16 +02:00
Makefile	can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices	2019-07-24 10:31:53 +02:00
at91_can.c	can: drivers: fix spelling mistakes	2020-09-21 10:13:16 +02:00
dev.c	can: dev: add a helper function to calculate the duration of one bit	2020-10-07 23:17:45 +02:00
flexcan.c	can: flexcan: remove ack_grp and ack_bit handling from driver	2020-10-07 23:18:33 +02:00
grcan.c	can: drivers: fix spelling mistakes	2020-09-21 10:13:16 +02:00
janz-ican3.c	treewide: Remove uninitialized_var() usage	2020-07-16 12:35:15 -07:00
kvaser_pciefd.c	can: kvaser_pciefd: the PWM generator is running at the bus frequency of the system.	2019-09-03 10:23:57 +02:00
led.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
pch_can.c	can: pch_can: use generic power management	2020-09-21 10:13:18 +02:00
rx-offload.c	can: rx-offload: can_rx_offload_add_manual(): add new initialization function	2020-09-21 10:13:19 +02:00
slcan.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
sun4i_can.c	net: Fix return value about devm_platform_ioremap_resource()	2020-05-23 16:28:25 -07:00
ti_hecc.c	can: ti_hecc: convert to devm_platform_ioremap_resource_byname()	2020-09-21 10:13:17 +02:00
vcan.c	can: make use of preallocated can_ml_priv for per device struct can_dev_rcv_lists	2019-09-04 13:29:15 +02:00
vxcan.c	can: make use of preallocated can_ml_priv for per device struct can_dev_rcv_lists	2019-09-04 13:29:15 +02:00
xilinx_can.c	can: xilinx_can: Fix incorrect variable and initialize with a default value	2020-10-07 23:18:34 +02:00