Merge tag 'nfc-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Apr 2017 19:29:40 +0000 (15:29 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Apr 2017 19:29:40 +0000 (15:29 -0400)
commit69e3948aaa559670da2662ad9d5cbc782bfc6885
tree9cc3ef9f538b813d53a31056a93f8e56401569f7
parentea8ffc0818d8a47ffda423f61f1d8ad1caca8986
parent4ea206395d3aede32bab94a75ec573530486fa44
Merge tag 'nfc-next-4.12-1' of git://git./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>
MAINTAINERS
net/nfc/netlink.c