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
..
kvaser_usb	can: kvaser_usb: Add new Kvaser hydra devices	2020-11-20 12:06:47 +01:00
peak_usb	can: drivers: add len8_dlc support for various CAN adapters	2020-11-20 12:05:14 +01:00
ems_usb.c	can: replace can_dlc as variable/element for payload length	2020-11-20 12:04:12 +01:00
esd_usb2.c	can: drivers: add len8_dlc support for esd_usb2 CAN adapter	2020-11-20 12:05:14 +01:00
gs_usb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08:00
Kconfig	can: kvaser_usb: Add new Kvaser hydra devices	2020-11-20 12:06:47 +01:00
Makefile	can: kvaser_usb: Split driver into kvaser_usb_core.c and kvaser_usb_leaf.c	2018-07-27 10:40:19 +02:00
mcba_usb.c	can: replace can_dlc as variable/element for payload length	2020-11-20 12:04:12 +01:00
ucan.c	can: replace can_dlc as variable/element for payload length	2020-11-20 12:04:12 +01:00
usb_8dev.c	can: drivers: add len8_dlc support for various CAN adapters	2020-11-20 12:05:14 +01:00