| commit | ec87652694897444c03c1e9263cec7f82b83d1aa | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jul 29 10:31:20 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jul 29 10:31:20 2014 -0400 |
| tree | 309276649de94e6bdb5ccc4ba35ad26f06899422 | |
| parent | 9a244409d0b0cf3b1e46f1dc331f2c718597fae0 [diff] | |
| parent | bf30a67c947ed57c1cf7c68a47dc24331458037e [diff] |
Merge tag 'nfc-next-3.17-1' of git://git.kernel.org/pub/scm/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>