summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-08-23 20:42:57 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-23 20:42:57 -0700
commitd9893d1351e11f565940df6cd6f9bf13aac27a3a (patch)
treedfe753af88000e38fac4c3e59b5d39dd32338feb /MAINTAINERS
parent751a587ac9f9a8bf314590fbac32d9e418060c5a (diff)
parent29e76924cf087bc6a9114a9244828fd13ae959bb (diff)
downloadlinux-d9893d1351e11f565940df6cd6f9bf13aac27a3a.tar.bz2
Merge tag 'nfc-next-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says: ==================== NFC 4.3 pull request This is the NFC pull request for 4.3. With this one we have: - A new driver for Samsung's S3FWRN5 NFC chipset. In order to properly support this driver, a few NCI core routines needed to be exported. Future drivers like Intel's Fields Peak will benefit from this. - SPI support as a physical transport for STM st21nfcb. - An additional netlink API for sending replies back to userspace from vendor commands. - 2 small fixes for TI's trf7970a - A few st-nci fixes. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7b1b552630b8..4e6dcb692d30 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8881,6 +8881,12 @@ L: linux-media@vger.kernel.org
S: Supported
F: drivers/media/i2c/s5k5baf.c
+SAMSUNG S3FWRN5 NFC DRIVER
+M: Robert Baldyga <r.baldyga@samsung.com>
+L: linux-nfc@lists.01.org (moderated for non-subscribers)
+S: Supported
+F: drivers/nfc/s3fwrn5
+
SAMSUNG SOC CLOCK DRIVERS
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
M: Tomasz Figa <tomasz.figa@gmail.com>