diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-23 20:42:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-23 20:42:57 -0700 |
| commit | d9893d1351e11f565940df6cd6f9bf13aac27a3a (patch) | |
| tree | dfe753af88000e38fac4c3e59b5d39dd32338feb /drivers/gpio/gpio-max7300.c | |
| parent | 751a587ac9f9a8bf314590fbac32d9e418060c5a (diff) | |
| parent | 29e76924cf087bc6a9114a9244828fd13ae959bb (diff) | |
Merge tag 'nfc-next-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.3 pull request
This is the NFC pull request for 4.3.
With this one we have:
- A new driver for Samsung's S3FWRN5 NFC chipset. In order to
properly support this driver, a few NCI core routines needed
to be exported. Future drivers like Intel's Fields Peak will
benefit from this.
- SPI support as a physical transport for STM st21nfcb.
- An additional netlink API for sending replies back to userspace
from vendor commands.
- 2 small fixes for TI's trf7970a
- A few st-nci fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpio/gpio-max7300.c')
0 files changed, 0 insertions, 0 deletions