David S. Miller ac80010fc9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Mere overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-12-22 15:15:05 -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 probing without ACPI	2019-12-09 20:15:17 -08:00
pn533	nfc: pn533: pn533_phy_ops dev_[up, down] return int	2019-11-13 12:15:03 -08:00
pn544	NFC: pn544: Adjust indentation in pn544_hci_check_presence	2019-12-19 18:13:53 -08:00
s3fwrn5	nfc: s3fwrn5: replace the assertion with a WARN_ON	2019-12-19 17:33:23 -08: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: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu().	2019-12-09 14:27:26 -08:00
trf7970a.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 417	2019-06-05 17:37:15 +02:00