summaryrefslogtreecommitdiffstats
path: root/net/wireless/chan.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-22 13:56:46 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-05-22 13:56:46 -0400
commit99abe65ff18b6bbac2e55524827b571c3eccfa86 (patch)
treeead3a34e03ea6f7900d98376e3f37f0571144fad /net/wireless/chan.c
parent96810471673393c931595a013f0f3094b564b1e9 (diff)
parent7974728094d35f38775417a26d8f30ea3602496a (diff)
downloadop-kernel-dev-99abe65ff18b6bbac2e55524827b571c3eccfa86.zip
op-kernel-dev-99abe65ff18b6bbac2e55524827b571c3eccfa86.tar.gz
Merge tag 'nfc-next-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says: "NFC: 3.16: First pull request This is the NFC pull request for 3.16. We have: - STMicroeectronics st21nfca support. The st21nfca is an HCI chipset and thus relies on the HCI stack. This submission provides support for tag redaer/writer mode (including Type 5) and device tree bindings. - PM runtime support and a bunch of bug fixes for TI's trf7970a. - Device tree support for NXP's pn544. Legacy platform data support is obviously kept intact. - NFC Tag type 4B support to the NFC Digital stack. - SOCK_RAW type support to the raw NFC socket, and allow NCI sniffing from that. This can be extended to report HCI frames and also proprietarry ones like e.g. the pn533 ones." Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/chan.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud