Merge tag 'nfc-next-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorDavid S. Miller <davem@davemloft.net>
Mon, 13 Nov 2017 01:39:12 +0000 (10:39 +0900)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Nov 2017 01:39:12 +0000 (10:39 +0900)
Samuel Ortiz says:

====================
NFC 4.15 pull request

This is the NFC pull request for 4.15. We have:

- A new netlink command for explicitly deactivating NFC targets
- i2c constification for all NFC drivers
- One NFC device allocation error path fix
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge