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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/libertas/cfg.c

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
Simple merge

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.h
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-shared.h
Simple merge

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

diff --cc drivers/net/wireless/libertas/cfg.c
index 89f34ad8d34acd1f01ba34644339bdffa228fdb1,a7f1ab28940d3ae6ad8e4fbda26b18087b4c21b4..d1d84e0e30fcfd2e6a19aa11dbdc6e6db2c77112
--- 1/drivers/net/wireless/libertas/cfg.c
--- 2/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@@ -633,9 -632,9 +633,9 @@@ static int lbs_ret_scan(struct lbs_priv
                                     LBS_SCAN_RSSI_TO_MBM(rssi)/100);
  
                        if (channel &&
 -                          !(channel->flags & IEEE80211_CHAN_DISABLED))
 -                              cfg80211_inform_bss(wiphy, channel,
 +                          !(channel->flags & IEEE80211_CHAN_DISABLED)) {
 +                              bss = cfg80211_inform_bss(wiphy, channel,
-                                       bssid, le64_to_cpu(*(__le64 *)tsfdesc),
+                                       bssid, get_unaligned_le64(tsfdesc),
                                        capa, intvl, ie, ielen,
                                        LBS_SCAN_RSSI_TO_MBM(rssi),
                                        GFP_KERNEL);

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

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

diff --cc drivers/net/wireless/p54/p54spi.c
index 546551389a1dad4c8d9e2c1c7d89a792b88f3b2f,78d0d6988553d40354b9fbf2396e1657eaefd9c6..7faed62c63786a629c64cfbd423dc228227e8768
--- 1/drivers/net/wireless/p54/p54spi.c
--- 2/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@@ -581,11 -581,13 +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/prism54/isl_ioctl.c
Simple merge

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

diff --cc drivers/net/wireless/rtlwifi/ps.c
Simple merge

diff --cc net/mac80211/agg-tx.c
index 266cc871c72dac756c313343582e3d0436965867,331472ce038cca49453c31dfdc973ee127102d53..2c2e9519a2e73bcd4b3ba0f7618ae2c723f2494a
--- 1/net/mac80211/agg-tx.c
--- 2/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@@ -177,10 -183,7 +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/main.c
Simple merge

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

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

diff --cc net/mac80211/status.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