From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 29 Jul 2014 14:31:20 +0000 (-0400)
Subject: Merge tag 'nfc-next-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Tag: v3.17-rc1~106^2~12^2~43
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ec87652694897444c03c1e9263cec7f82b83d1aa;p=linux-2.6-block.git

Merge tag 'nfc-next-3.17-1' of git://git./linux/kernel/git/sameo/nfc-next

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

"NFC: 3.17 pull request

This is the NFC pull request for 3.17.
This is a rather quiet one, we have:

- A new driver from ST Microelectronics for their NCI ST21NFCB,
  including device tree  support.

- p2p support for the ST21NFCA driver

- A few fixes an enhancements for the NFC digital layer"

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

ec87652694897444c03c1e9263cec7f82b83d1aa