diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-03-20 16:53:20 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-20 16:53:20 +0100 |
commit | 7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch) | |
tree | 6cd273487574edd2da40ce14b1981e14a5171caa /drivers/nfc/pn544/pn544.h | |
parent | mwifiex: update MCS set as per RX-STBC bit from hostapd (diff) | |
parent | cfg80211: remove macro ASSERT_RDEV_LOCK(rdev) (diff) | |
download | linux-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