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
..
core.c	nfc: s3fwrn5: constify nci_ops	2021-07-25 09:21:20 +01:00
firmware.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
firmware.h	nfc: s3fwrn5: skip the NFC bootloader mode	2020-12-04 15:30:47 -08:00
i2c.c	nfc: s3fwrn5: mark OF device ID tables as maybe unused	2021-05-28 15:05:56 -07:00
Kconfig	nfc: s3fwrn5: Support a UART interface	2020-12-02 17:55:25 -08:00
Makefile	nfc: s3fwrn5: Support a UART interface	2020-12-02 17:55:25 -08:00
nci.c	nfc: constify nci_driver_ops (prop_ops and core_ops)	2021-07-25 09:21:21 +01:00
nci.h	nfc: constify nci_driver_ops (prop_ops and core_ops)	2021-07-25 09:21:21 +01:00
phy_common.c	nfc: s3fwrn5: Remove the delay for NFC sleep	2020-12-16 13:09:35 -08:00
phy_common.h	nfc: s3fwrn5: Support a UART interface	2020-12-02 17:55:25 -08:00
s3fwrn5.h	nfc: s3fwrn5: Change the error code	2020-11-18 17:42:13 -08:00
uart.c	nfc: s3fwrn5: Support a UART interface	2020-12-02 17:55:25 -08:00