diff options
author | David S. Miller <davem@davemloft.net> | 2016-01-05 03:48:15 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-01-05 03:48:15 +0100 |
commit | 15ab90f400781a801017ea2bd8597e6eb3f39f79 (patch) | |
tree | 561d350474e9eeecf4e0364291366b193460c974 /MAINTAINERS | |
parent | udp: properly support MSG_PEEK with truncated buffers (diff) | |
parent | NFC: nci: memory leak in nci_core_conn_create() (diff) | |
download | linux-15ab90f400781a801017ea2bd8597e6eb3f39f79.tar.xz linux-15ab90f400781a801017ea2bd8597e6eb3f39f79.zip |
Merge tag 'nfc-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.5 pull request
This is the first NFC pull request for 4.5 and it brings:
- A new driver for the STMicroelectronics ST95HF NFC chipset.
The ST95HF is an NFC digital transceiver with an embedded analog
front-end and as such relies on the Linux NFC digital
implementation. This is the 3rd user of the NFC digital stack.
- ACPI support for the ST st-nci and st21nfca drivers.
- A small improvement for the nfcsim driver, as we can now tune
the Rx delay through sysfs.
- A bunch of minor cleanups and small fixes from Christophe Ricard,
for a few drivers and the NFC core code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b74287301edf..74b84d44ee98 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7523,7 +7523,12 @@ F: net/nfc/ F: include/net/nfc/ F: include/uapi/linux/nfc.h F: drivers/nfc/ +F: include/linux/platform_data/microread.h +F: include/linux/platform_data/nfcmrvl.h +F: include/linux/platform_data/nxp-nci.h F: include/linux/platform_data/pn544.h +F: include/linux/platform_data/st21nfca.h +F: include/linux/platform_data/st-nci.h F: Documentation/devicetree/bindings/net/nfc/ NFS, SUNRPC, AND LOCKD CLIENTS |