From: David S. Miller <davem@davemloft.net>
Date: Mon, 13 Nov 2017 01:39:12 +0000 (+0900)
Subject: Merge tag 'nfc-next-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Tag: v4.15-rc1~84^2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6afce196236c353819526a1c41fffb6d660eb2ef;p=thirdparty%2Flinux.git

Merge tag 'nfc-next-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next

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>
---

6afce196236c353819526a1c41fffb6d660eb2ef