diff options
| author | David S. Miller | 2015-10-30 12:19:43 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-10-30 12:19:43 +0100 |
| commit | 740215ddb5b3faa0006505de073654cc50e9a299 (patch) | |
| tree | d5fe2874a75353e042f5c541aa15f34167d51fc4 /net/switchdev | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | NFC: nci: non-static functions can not be inline (diff) | |
| download | kernel-qcow2-linux-740215ddb5b3faa0006505de073654cc50e9a299.tar.gz kernel-qcow2-linux-740215ddb5b3faa0006505de073654cc50e9a299.tar.xz kernel-qcow2-linux-740215ddb5b3faa0006505de073654cc50e9a299.zip | |
Merge tag 'nfc-next-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.4 pull request
This is the NFC pull request for 4.4.
It's a bit bigger than usual, the 3 main culprits being:
- A new driver for Intel's Fields Peak NCI chipset. In order to
support this chipset we had to export a few NCI routines and
extend the driver NCI ops to not only support proprietary
commands but also core ones.
- Support for vendor commands for both STM drivers, st-nci
and st21nfca. Those vendor commands allow to run factory tests
through the NFC netlink interface.
- New i2c and SPI support for the Marvell driver, together with
firmware download support for this driver's core.
Besides that we also have:
- A few file renames in the STM drivers, to keep the naming
consistent between drivers.
- Some improvements and fixes on the NCI HCI layer, mostly to
properly reach a secure element over a legacy HCI link.
- A few fixes for the s3fwrn5 and trf7970a drivers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev')
0 files changed, 0 insertions, 0 deletions