From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 30 May 2014 17:41:40 +0000 (-0400)
Subject: Merge tag 'nfc-next-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57afc62e9422954329adecdb8251cc232e9fe308;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'nfc-next-3.16-2' of git://git./linux/kernel/git/sameo/nfc-next

Samuel Ortiz <sameo@linux.intel.com> says:

"NFC: 3.16: Second pull request

This is the 2nd NFC pull request for 3.16. We have:

- Felica (Type3) tags support for trf7970a
- Type 4b tags support for port100
- st21nfca DTS typo fix
- A few sparse warning check fixes"

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

57afc62e9422954329adecdb8251cc232e9fe308