David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07:00
..
kvaser_usb	can: kvaser_usb: Use struct_size() in alloc_candev()	2019-07-24 10:31:53 +02:00
peak_usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 17:11:59 -07:00
Kconfig	can: usb: Kconfig: Remove duplicate menu entry	2019-06-07 23:03:53 +02: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	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 164	2019-05-30 11:26:38 -07:00
esd_usb2.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 164	2019-05-30 11:26:38 -07:00
gs_usb.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 285	2019-06-05 17:36:37 +02:00
mcba_usb.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 412	2019-06-05 17:37:14 +02:00
ucan.c	can: ucan: fix spelling mistake: "resumbmitting" -> "resubmitting"	2018-11-28 16:19:52 +01:00
usb_8dev.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 412	2019-06-05 17:37:14 +02:00