diff options
| author | David S. Miller <davem@davemloft.net> | 2015-04-08 23:12:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-08 23:12:50 +0200 |
| commit | 82740b9ac2fbd935361c1dc770ec49b692c28e7d (patch) | |
| tree | 484bd5cfea3461fbd7c5aa203f4a06a1d8a5d88c /MAINTAINERS | |
| parent | sfc: Revert SRIOV changes. (diff) | |
| parent | NFC: logging neatening (diff) | |
| download | linux-82740b9ac2fbd935361c1dc770ec49b692c28e7d.tar.xz linux-82740b9ac2fbd935361c1dc770ec49b692c28e7d.zip | |
Merge tag 'nfc-next-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC: 4.1 pull request
This is the NFC pull request for 4.1.
This is a shorter one than usual, as the Intel Field Peak NFC
driver could not make it in time.
We have:
- A new driver for NXP NCI based chipsets, like e.g. the NPC100 or
the PN7150. It currently only supports an i2c physical layer, but
could easily be extended to work on top of e.g. SPI.
This driver also includes support for user space triggered firmware
updates.
- A few minor st21nfc[ab] fixes, cleanups, and comments improvements.
- A pn533 error return fix.
- A few NFC related logs formatting cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9091b4ad1cc3..dcaa54252479 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6944,6 +6944,13 @@ S: Supported F: drivers/block/nvme* F: include/linux/nvme.h +NXP-NCI NFC DRIVER +M: Clément Perrochaud <clement.perrochaud@effinnov.com> +R: Charles Gorand <charles.gorand@effinnov.com> +L: linux-nfc@lists.01.org (moderated for non-subscribers) +S: Supported +F: drivers/nfc/nxp-nci + NXP TDA998X DRM DRIVER M: Russell King <rmk+kernel@arm.linux.org.uk> S: Supported |