Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-11-27 18:25:27 -08:00
..
fdp	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
microread	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
nfcmrvl	nfc: Fix Kconfig indentation	2019-11-20 12:30:40 -08:00
nxp-nci	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
pn533	nfc: pn533/usb.c: fix spelling of "functions"	2020-09-08 20:25:51 -07:00
pn544	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
s3fwrn5	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08:00
st-nci	nfc: st-nci: Remove unnecessary cast	2020-08-20 16:17:45 -07:00
st21nfca	nfc: remove unneeded break	2020-10-20 10:36:41 -07:00
st95hf	NFC: st95hf: Fix memleak in st95hf_in_send_cmd	2020-08-24 17:34:25 -07:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile
mei_phy.c	nfc/mei: convert to SPDX license tags	2019-03-28 02:07:54 +09:00
mei_phy.h
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	nfc: remove unneeded break	2020-10-20 10:36:41 -07:00