linux_old1/drivers/nfc
Jakub Kicinski a9f852e92e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock
from commit c8183f5489 ("s390/qeth: fix potential deadlock on
workqueue flush"), removed the code which was removed by commit
9897d583b0 ("s390/qeth: consolidate some duplicated HW cmd code").

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
2019-11-22 16:27:24 -08:00
..
fdp NFC: fdp: fix incorrect free object 2019-11-05 18:31:45 -08:00
microread treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 399 2019-06-05 17:37:12 +02:00
nfcmrvl nfc: Fix Kconfig indentation 2019-11-20 12:30:40 -08:00
nxp-nci NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error 2019-11-11 21:40:55 -08:00
pn533 nfc: pn533: pn533_phy_ops dev_[up, down] return int 2019-11-13 12:15:03 -08:00
pn544 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 399 2019-06-05 17:37:12 +02:00
s3fwrn5 nfc: s3fwrn5: fix platform_no_drv_owner.cocci warning 2019-10-06 18:38:52 +02:00
st-nci st_nci_hci_connectivity_event_received: null check the allocation 2019-07-25 11:48:06 -07:00
st21nfca NFC: st21nfca: fix double free 2019-11-06 21:48:29 -08:00
st95hf NFC: st95hf: clean up indentation issue 2019-09-27 20:31:18 +02:00
Kconfig treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mei_phy.c nfc/mei: convert to SPDX license tags 2019-03-28 02:07:54 +09:00
mei_phy.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
nfcsim.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 288 2019-06-05 17:36:37 +02:00
port100.c nfc: port100: handle command failure cleanly 2019-11-21 11:48:17 -08:00
trf7970a.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 417 2019-06-05 17:37:15 +02:00