From: David S. Miller Date: Thu, 29 Jan 2015 06:49:55 +0000 (-0800) Subject: Merge tag 'nfc-next-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547;p=linux-beck.git Merge tag 'nfc-next-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next NFC: 3.20 first pull request This is the first NFC pull request for 3.20. With this one we have: - Secure element support for the ST Micro st21nfca driver. This depends on a few HCI internal changes in order for example to support more than one secure element per controller. - ACPI support for NXP's pn544 HCI driver. This controller is found on many x86 SoCs and is typically enumerated on the ACPI bus there. - A few st21nfca and st21nfcb fixes. Signed-off-by: David S. Miller --- b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547