diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-06-15 16:44:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-15 16:44:19 -0700 |
| commit | 023033b1ec821951795d982a81cb942b879d276e (patch) | |
| tree | b161acc8a976e94acfc8f6ee20aff54670f18fbd /net/bridge | |
| parent | Merge branch 'bond-netlink-3ad-attrs' (diff) | |
| parent | NFC: nfcmrvl: set PB_BAIL_OUT at setup (diff) | |
| download | linux-dev-023033b1ec821951795d982a81cb942b879d276e.tar.xz linux-dev-023033b1ec821951795d982a81cb942b879d276e.zip | |
Merge tag 'nfc-next-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.2 pull request
This is the NFC pull request for 4.2.
- NCI drivers can now define their own handlers for processing
proprietary NCI responses and notifications.
- NFC vendors can use a dedicated netlink API to send their own
proprietary commands, like e.g. all commands needed to implement
vendor specific manufacturing tools.
- A new generic NCI over UART driver against which any NCI chipset
running on top of a serial interface can register.
- The st21nfcb driver is renamed to st-nci as it can and will support
most of ST Microelectronics NCI chipsets.
- The st21nfcb driver can put its CLF in hibernate mode and save
significant amount of power.
- A few st21nfcb minor fixes.
- The NXP NCI driver now supports ACPI enumeration.
- The Marvell NCI driver now supports both USB and serial
physical interfaces.
- The Marvell NCI drivers also supports NCI frames being muxed
over HCI. This is a setting that can be defined by a DT property.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
0 files changed, 0 insertions, 0 deletions