diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-01-28 22:49:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-28 22:49:55 -0800 |
| commit | b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547 (patch) | |
| tree | 8f2b80088b24b7c5fb0aba4c6b3b45b5ca4a2bb2 /drivers/net/ethernet/hisilicon/hip04_eth.c | |
| parent | Merge branch 'stmmac-pci' (diff) | |
| parent | NFC: Add ACPI support for NXP PN544 (diff) | |
| download | linux-dev-b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547.tar.xz linux-dev-b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547.zip | |
Merge tag 'nfc-next-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
NFC: 3.20 first pull request
This is the first NFC pull request for 3.20.
With this one we have:
- Secure element support for the ST Micro st21nfca driver. This depends
on a few HCI internal changes in order for example to support more
than one secure element per controller.
- ACPI support for NXP's pn544 HCI driver. This controller is found on
many x86 SoCs and is typically enumerated on the ACPI bus there.
- A few st21nfca and st21nfcb fixes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hip04_eth.c')
0 files changed, 0 insertions, 0 deletions