Merge tag 'mac80211-next-for-davem-2015-08-14' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Mon, 17 Aug 2015 21:25:04 +0000 (14:25 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Aug 2015 21:25:04 +0000 (14:25 -0700)
commit2bd736fa0d8a1da90e6ccaa6a79e56a8d2ae60c4
treed855a6972df023eeef682498be454f1dedc638c1
parent90eb7fa51ccb9af58c437581af73c4a1d5fd2b9f
parent8f9c98df949333f08b74e5df1caacf7e2c5e8552
Merge tag 'mac80211-next-for-davem-2015-08-14' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Another pull request for the next cycle, this time with quite
a bit of content:
 * mesh fixes/improvements from Alexis, Bob, Chun-Yeow and Jesse
 * TDLS higher bandwidth support (Arik)
 * OCB fixes from Bertold Van den Bergh
 * suspend/resume fixes from Eliad
 * dynamic SMPS support for minstrel-HT (Krishna Chaitanya)
 * VHT bitrate mask support (Lorenzo Bianconi)
 * better regulatory support for 5/10 MHz channels (Matthias May)
 * basic support for MU-MIMO to avoid the multi-vif issue (Sara Sharon)
along with a number of other cleanups.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wireless/iwlwifi/mvm/sta.c