linux/drivers/nfc/s3fwrn5
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
..
core.c nfc: s3fwrn5: Remove the max_payload 2020-11-18 17:42:13 -08:00
firmware.c nfc: s3fwrn5: Fix the misspelling in a comment 2020-11-18 17:42:13 -08:00
firmware.h nfc: s3fwrn5: Constify s3fwrn5_fw_info when not modified 2020-09-10 15:22:16 -07:00
i2c.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-11-27 18:25:27 -08:00
Kconfig nfc: s3fwrn5: Add missing CRYPTO_HASH dependency 2020-09-10 15:22:16 -07:00
Makefile treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
nci.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 123 2019-05-24 17:39:03 +02:00
nci.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 123 2019-05-24 17:39:03 +02:00
s3fwrn5.h nfc: s3fwrn5: Change the error code 2020-11-18 17:42:13 -08:00