Merge tag 'mac80211-for-davem-2015-10-13' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Oct 2015 01:34:25 +0000 (18:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Oct 2015 01:34:25 +0000 (18:34 -0700)
commitef41a2cedb14871203ee28d7a5cb5aafe4e97439
treee1a2824b5a873575e5a56301a760bcce26fea97c
parent0f8b8e28fb3241f9fd82ce13bac2b40c35e987e0
parent4633dfc32c0019bed2996de9bbdbe7f3b518a44e
Merge tag 'mac80211-for-davem-2015-10-13' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Like last time, we have two small fixes:
 * fast-xmit was not doing powersave filter clearing correctly,
   disable fast-xmit while any such operations are still pending
 * a debugfs file was broken due to some infrastructure changes
====================

Signed-off-by: David S. Miller <davem@davemloft.net>