Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
d2e11fd2b7
linux/drivers/nfc
History
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
..
fdp nfc: fdp: constify several pointers 2021-07-29 12:28:03 +01:00
microread nfc: microread: constify several pointers 2021-07-29 12:28:03 +01:00
nfcmrvl nfc: mrvl: correct nfcmrvl_spi_parse_dt() device_node argument 2021-07-30 17:22:51 +02:00
nxp-nci nfc: constify nci_ops 2021-07-25 09:21:20 +01:00
pn533 nfc: constify nfc_ops 2021-07-25 09:21:21 +01:00
pn544 nfc: constify local pointer variables 2021-07-30 17:22:52 +02:00
s3fwrn5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-07-31 09:14:46 -07:00
st21nfca nfc: constify nfc_hci_ops 2021-07-25 09:21:21 +01:00
st95hf nfc: constify nfc_digital_ops 2021-07-25 09:21:21 +01:00
st-nci nfc: constify pointer to nfc_vendor_cmd 2021-07-25 09:21:21 +01:00
Kconfig nfc: Add a virtual nci device driver 2021-01-29 18:03:33 -08:00
Makefile nfc: Add a virtual nci device driver 2021-01-29 18:03:33 -08:00
mei_phy.c nfc: mei_phy: constify buffer passed to mei_nfc_send() 2021-07-29 12:28:02 +01:00
mei_phy.h nfc: constify nfc_phy_ops 2021-07-25 09:21:21 +01:00
nfcsim.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-07-31 09:14:46 -07:00
port100.c nfc: port100: constify several pointers 2021-07-29 12:28:03 +01:00
trf7970a.c nfc: trf7970a: constify several pointers 2021-07-29 12:28:03 +01:00
virtual_ncidev.c nfc: virtual_ncidev: constify pointer to nfc_dev 2021-07-29 12:28:03 +01:00