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
index 78d0d6988553d40354b9fbf2396e1657eaefd9c6,546551389a1dad4c8d9e2c1c7d89a792b88f3b2f..7faed62c63786a629c64cfbd423dc228227e8768
--- 1/drivers/net/wireless/p54/p54spi.c
--- 2/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@@ -581,13 -581,11 +581,9 @@@ static void p54spi_op_stop(struct ieee8
        struct p54s_priv *priv = dev->priv;
        unsigned long flags;
  
-       if (mutex_lock_interruptible(&priv->mutex)) {
-               /* FIXME: how to handle this error? */
-               return;
-       }
- 
+       mutex_lock(&priv->mutex);
        WARN_ON(priv->fw_state != FW_STATE_READY);
  
 -      cancel_work_sync(&priv->work);
 -
        p54spi_power_off(priv);
        spin_lock_irqsave(&priv->tx_lock, flags);
        INIT_LIST_HEAD(&priv->tx_pending);

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/debugfs_sta.c
Simple merge

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

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

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

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

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