David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
kvaser_usb	can: kvaser_usb: Simplify struct kvaser_cmd_cardinfo	2018-07-27 10:40:19 +02:00
peak_usb	can: peak_usb: mark expected switch fall-throughs	2018-07-27 10:40:17 +02:00
Kconfig	can: kvaser_usb: Add support for Kvaser USB hydra family	2018-07-27 10:40:19 +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	can: ems_usb: Fix memory leak on ems_usb_disconnect()	2018-07-30 11:04:27 +02:00
esd_usb2.c	drivers/net: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
gs_usb.c	linux-can-next-for-4.16-20180105	2018-01-15 16:13:34 -05:00
mcba_usb.c	can: mcba_usb: cancel urb on -EPROTO	2017-12-08 10:45:11 +01:00
ucan.c	can: ucan: add driver for Theobroma Systems UCAN devices	2018-07-27 10:40:16 +02:00
usb_8dev.c	can: usb_8dev: cancel urb on -EPIPE and -EPROTO	2017-12-08 10:45:11 +01:00