David S. Miller 2f184393e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Several cases of overlapping changes which were for the most part trivially resolvable. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-10-20 10:43:00 -07:00
..
fdp	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157	2019-05-30 11:26:37 -07:00
microread	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 399	2019-06-05 17:37:12 +02:00
nfcmrvl	nfc: nfcmrvl: fix platform_no_drv_owner.cocci warning	2019-10-06 18:38:28 +02:00
nxp-nci	NFC: nxp-nci: Fix recommendation for NFC_NXP_NCI_I2C Kconfig	2019-07-29 08:56:27 -07:00
pn533	NFC: pn533: fix use-after-free and memleaks	2019-10-08 16:52:26 -07: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	st21nfca_connectivity_event_received: null check the allocation	2019-07-25 11:47:10 -07: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	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 288	2019-06-05 17:36:37 +02:00
trf7970a.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 417	2019-06-05 17:37:15 +02:00