Jakub Kicinski 0fe2f273ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/can/dev.c commit 03f16c5075 ("can: dev: can_restart: fix use after free bug") commit 3e77f70e73 ("can: dev: move driver related infrastructure into separate subdir") Code move. drivers/net/dsa/b53/b53_common.c commit 8e4052c32d ("net: dsa: b53: fix an off by one in checking "vlan->vid"") commit b7a9e0da2d ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects") Field rename. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-01-20 12:16:11 -08:00
..
kvaser_usb	can: dev: can_get_echo_skb(): extend to return can frame length	2021-01-14 08:43:43 +01:00
peak_usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-01-20 12:16:11 -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
ems_usb.c	can: dev: can_get_echo_skb(): extend to return can frame length	2021-01-14 08:43:43 +01:00
esd_usb2.c	can: dev: can_get_echo_skb(): extend to return can frame length	2021-01-14 08:43:43 +01:00
gs_usb.c	can: dev: can_get_echo_skb(): extend to return can frame length	2021-01-14 08:43:43 +01:00
mcba_usb.c	can: dev: can_get_echo_skb(): extend to return can frame length	2021-01-14 08:43:43 +01:00
ucan.c	can: dev: can_get_echo_skb(): extend to return can frame length	2021-01-14 08:43:43 +01:00
usb_8dev.c	can: dev: can_get_echo_skb(): extend to return can frame length	2021-01-14 08:43:43 +01:00