summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/pn544/pn544.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-03-20 16:53:20 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-03-20 16:53:20 +0100
commit7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch)
tree6cd273487574edd2da40ce14b1981e14a5171caa /drivers/nfc/pn544/pn544.h
parentmwifiex: update MCS set as per RX-STBC bit from hostapd (diff)
parentcfg80211: remove macro ASSERT_RDEV_LOCK(rdev) (diff)
downloadlinux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.xz
linux-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.zip
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/nfc/pn544/pn544.h')
0 files changed, 0 insertions, 0 deletions