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
..
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
pcan_usb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
pcan_usb_core.c	can: peak_usb: peak_usb_probe(): make use of driver_info	2021-04-13 10:15:43 +02:00
pcan_usb_core.h	can: peak_usb: remove write only variable struct peak_usb_adapter::ts_period	2021-04-13 10:15:43 +02:00
pcan_usb_fd.c	can: peak_usb: remove write only variable struct peak_usb_adapter::ts_period	2021-04-13 10:15:43 +02:00
pcan_usb_pro.c	can: peak_usb: pcan_usb_{,pro}_get_device_id(): remove unneeded check for device_id	2021-04-13 10:15:43 +02:00
pcan_usb_pro.h	can: peak_usb: pcan_usb_pro.h: remove double space in indention	2021-04-13 10:15:43 +02:00