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

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

diff --cc drivers/net/wireless/p54/p54spi.c
index 78d0d69,a454d48..2d5cf5b
--- 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 net/mac80211/debugfs_sta.c
Simple merge

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

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

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