summaryrefslogtreecommitdiff
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-12-04 11:27:40 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-12-04 11:27:40 -0500
commit04bb7ecf8854186f47fb1ea321fc77e7bc931993 (patch)
treed868ed692edebb2b2a31ecb16c5ab057fb3b008d /net/mac80211/iface.c
parentea375117013dcca43ea4ffeb920735ab71c75ef3 (diff)
parente479ce479743984a5d4581749f9aaa9c3bfd65e4 (diff)
downloadlinux-04bb7ecf8854186f47fb1ea321fc77e7bc931993.tar.gz
linux-04bb7ecf8854186f47fb1ea321fc77e7bc931993.tar.xz
Merge tag 'nfc-next-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says: "NFC: 3.19 pull request This is the NFC pull request for 3.19. With this one we get: - NFC digital improvements for DEP support: Chaining, NACK and ATN support added. - NCI improvements: Support for p2p target, SE IO operand addition, SE operands extensions to support proprietary implementations, and a few fixes. - NFC HCI improvements: OPEN_PIPE and NOTIFY_ALL_CLEARED support, and SE IO operand addition. - A bunch of minor improvements and fixes for STMicro st21nfcb and st21nfca" Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
0 files changed, 0 insertions, 0 deletions