diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-29 10:31:20 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-29 10:31:20 -0400 |
| commit | ec87652694897444c03c1e9263cec7f82b83d1aa (patch) | |
| tree | 309276649de94e6bdb5ccc4ba35ad26f06899422 /lib/plist.c | |
| parent | 9a244409d0b0cf3b1e46f1dc331f2c718597fae0 (diff) | |
| parent | bf30a67c947ed57c1cf7c68a47dc24331458037e (diff) | |
| download | linux-rt-ec87652694897444c03c1e9263cec7f82b83d1aa.tar.gz | |
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>
Diffstat (limited to 'lib/plist.c')
0 files changed, 0 insertions, 0 deletions