projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a24440 bf30a67)
Merge tag 'nfc-next-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jul 2014 14:31:20 +0000 (10:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Jul 2014 14:31:20 +0000 (10:31 -0400)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.