Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-11-27 18:25:27 -08:00
..
Kconfig	can: tcan4x5x: replace depends on REGMAP_SPI with depends on SPI	2020-11-15 18:24:36 +01:00
m_can_platform.c	can: m_can: Fix freeing of can device from peripherials	2020-11-15 18:33:45 +01:00
m_can.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08:00
m_can.h	can: m_can: m_can_class_free_dev(): introduce new function	2020-11-15 18:33:42 +01:00
Makefile	can: tcan4x5x: Add tcan4x5x driver to the kernel	2019-07-24 10:31:54 +02:00
tcan4x5x.c	can: m_can: Fix freeing of can device from peripherials	2020-11-15 18:33:45 +01:00