From: John W. Linville Date: Fri, 26 Sep 2014 17:37:02 +0000 (-0400) Subject: Merge tag 'nfc-next-3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... X-Git-Tag: firefly_0821_release~176^2~3001^2~75^2~80 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=330bd4ec9d046a6e6f8b7cf4a53c2d15b7705e00;p=firefly-linux-kernel-4.4.55.git Merge tag 'nfc-next-3.18-1' of git://git./linux/kernel/git/sameo/nfc-next Samuel Ortiz says: "NFC: 3.18 pull request This is the NFC pull request for 3.18. We've had major updates for TI and ST Microelectronics drivers: For TI's trf7970a driver: - Target mode support for trf7970a - Suspend/resume support for trf7970a - DT properties additions to handle different quirks - A bunch of fixes for smartphone IOP related issues For ST Microelectronics' ST21NFCA and ST21NFCB drivers: - ISO15693 support for st21nfcb - checkpatch and sparse related warning fixes - Code cleanups and a few minor fixes Finally, Marvell add ISO15693 support to the NCI stack, together with a couple of NCI fixes." Signed-off-by: John W. Linville --- 330bd4ec9d046a6e6f8b7cf4a53c2d15b7705e00