diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-21 15:29:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-21 15:29:40 -0400 |
| commit | 69e3948aaa559670da2662ad9d5cbc782bfc6885 (patch) | |
| tree | 9cc3ef9f538b813d53a31056a93f8e56401569f7 /MAINTAINERS | |
| parent | ea8ffc0818d8a47ffda423f61f1d8ad1caca8986 (diff) | |
| parent | 4ea206395d3aede32bab94a75ec573530486fa44 (diff) | |
| download | linux-69e3948aaa559670da2662ad9d5cbc782bfc6885.tar.gz linux-69e3948aaa559670da2662ad9d5cbc782bfc6885.tar.bz2 linux-69e3948aaa559670da2662ad9d5cbc782bfc6885.zip | |
Merge tag 'nfc-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.12 pull request
This is the NFC pull request for 4.12. We have:
- Improvements for the pn533 command queue handling and device
registration order.
- Removal of platform data for the pn544 and st21nfca drivers.
- Additional device tree options to support more trf7970a hardware options.
- Support for Sony's RC-S380P through the port100 driver.
- Removal of the obsolte nfcwilink driver.
- Headers inclusion cleanups (miscdevice.h, unaligned.h) for many drivers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 39aa09100a48..700d8906ff15 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8876,8 +8876,6 @@ S: Supported F: drivers/net/ethernet/qlogic/netxen/ NFC SUBSYSTEM -M: Lauro Ramos Venancio <lauro.venancio@openbossa.org> -M: Aloisio Almeida Jr <aloisio.almeida@openbossa.org> M: Samuel Ortiz <sameo@linux.intel.com> L: linux-wireless@vger.kernel.org L: linux-nfc@lists.01.org (subscribers-only) |