diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-26 13:37:02 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-26 13:37:02 -0400 |
| commit | 330bd4ec9d046a6e6f8b7cf4a53c2d15b7705e00 (patch) | |
| tree | d278d8325e1e1cfca1ecfaf592158dcec10539f2 /include/net/llc_c_ac.h | |
| parent | 687b93082c0469fe9fe85583e6265a3d910cd89a (diff) | |
| parent | 094e93592433312548dd5e43d7b24b152f658063 (diff) | |
| download | op-kernel-dev-330bd4ec9d046a6e6f8b7cf4a53c2d15b7705e00.zip op-kernel-dev-330bd4ec9d046a6e6f8b7cf4a53c2d15b7705e00.tar.gz | |
Merge tag 'nfc-next-3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says:
"NFC: 3.18 pull request
This is the NFC pull request for 3.18.
We've had major updates for TI and ST Microelectronics drivers:
For TI's trf7970a driver:
- Target mode support for trf7970a
- Suspend/resume support for trf7970a
- DT properties additions to handle different quirks
- A bunch of fixes for smartphone IOP related issues
For ST Microelectronics' ST21NFCA and ST21NFCB drivers:
- ISO15693 support for st21nfcb
- checkpatch and sparse related warning fixes
- Code cleanups and a few minor fixes
Finally, Marvell add ISO15693 support to the NCI stack, together with a
couple of NCI fixes."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/llc_c_ac.h')
0 files changed, 0 insertions, 0 deletions
