Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

diff --cc drivers/net/wireless/ath/ath9k/htc.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/htc_drv_init.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/htc_drv_main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/init.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/scan.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/sta.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/tx.c
index 8d18bf23e4bf74454be4d3757ef577d6a352c26c,4df12fa9d33685b285b489a67897479f8f8dc54a..74d60bf27750ae7d88dda39fbf473f971ddd8f79
--- 1/drivers/net/wireless/iwlwifi/mvm/tx.c
--- 2/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@@ -692,13 -680,7 +698,12 @@@ static void iwl_mvm_rx_tx_cmd_single(st
                        iwl_mvm_check_ratid_empty(mvm, sta, tid);
                        spin_unlock_bh(&mvmsta->lock);
                }
 +
 +              if (mvmsta->next_status_eosp) {
 +                      mvmsta->next_status_eosp = false;
 +                      ieee80211_sta_eosp(sta);
 +              }
        } else {
-               sta = NULL;
                mvmsta = NULL;
        }
  

diff --cc drivers/net/wireless/iwlwifi/mvm/utils.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8180/dev.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ht.c
Simple merge

diff --cc net/mac80211/ibss.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/core.h
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/nl80211.h
Simple merge