Jakub Kicinski d2e11fd2b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicting commits, all resolutions pretty trivial: drivers/bus/mhi/pci_generic.c 5c2c853159 ("bus: mhi: pci-generic: configurable network interface MRU") 56f6f4c4eb ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean") drivers/nfc/s3fwrn5/firmware.c a0302ff590 ("nfc: s3fwrn5: remove unnecessary label") 46573e3ab0 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") 801e541c79 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") MAINTAINERS 7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver") 8a7b46fa79 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-07-31 09:14:46 -07:00
..
etas_es58x	can: etas_es58x: rewrite the message cast in es58{1,_fd}_tx_can_msg to increase readability	2021-07-25 11:36:28 +02:00
kvaser_usb	can: kvaser_usb: Add new Kvaser hydra devices	2021-05-27 09:42:23 +02:00
peak_usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
Kconfig	can: kvaser_usb: Add new Kvaser hydra devices	2021-05-27 09:42:23 +02:00
Makefile	can: etas_es58x: add core support for ETAS ES58X CAN USB interfaces	2021-04-13 10:15:42 +02:00
ems_usb.c	can: ems_usb: fix memory leak	2021-07-30 08:47:24 +02:00
esd_usb2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
gs_usb.c	can: dev: can_free_echo_skb(): extend to return can frame length	2021-03-30 11:14:28 +02:00
mcba_usb.c	can: mcba_usb_start(): add missing urb->transfer_dma initialization	2021-07-30 08:47:01 +02:00
ucan.c	can: ucan: fix alignment constraints	2021-03-30 11:14:46 +02:00
usb_8dev.c	can: usb_8dev: fix memory leak	2021-07-30 08:47:05 +02:00