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 /scripts/objdiff | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | NFC: digital: Add 'tg_listen_md' and 'tg_get_rf_tech' driver hooks (diff) | |
| download | linux-ec87652694897444c03c1e9263cec7f82b83d1aa.tar.gz linux-ec87652694897444c03c1e9263cec7f82b83d1aa.zip | |
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 'scripts/objdiff')
0 files changed, 0 insertions, 0 deletions