Merge remote-tracking branch 'wireless-next/master'

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

diff --cc drivers/net/wireless/libertas/if_spi.c
Simple merge

diff --cc drivers/net/wireless/p54/p54spi.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc net/mac80211/agg-tx.c
index 556765749b9c645f14e4aa988903bfedb598b2d3,266cc871c72dac756c313343582e3d0436965867..2c2e9519a2e73bcd4b3ba0f7618ae2c723f2494a
--- 1/net/mac80211/agg-tx.c
--- 2/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@@ -185,7 -177,10 +185,8 @@@ int ___ieee80211_stop_tx_ba_session(str
               sta->sta.addr, tid);
  #endif /* CONFIG_MAC80211_HT_DEBUG */
  
 -      set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state);
 -
        del_timer_sync(&tid_tx->addba_resp_timer);
+       del_timer_sync(&tid_tx->session_timer);
  
        /*
         * After this packets are no longer handed right through

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

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

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