Merge remote-tracking branch 'wireless/master'

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 80397de11e0d2c182e121ec0e01b486eb62d0a07,f1be87454308c39f1a094bb315b0328b8abf8091..6cea546a15076be97fc7788f9ee3eecf6c813974
--- 1/drivers/net/wireless/ath/ath9k/ar9003_phy.h
--- 2/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@@ -839,19 -883,38 +883,38 @@@
   */
  #define AR_SM1_BASE   0xb200
  
- #define AR_PHY_SWITCH_CHAIN_1    (AR_SM1_BASE + 0x84)
- #define AR_PHY_FCAL_2_1          (AR_SM1_BASE + 0xd0)
- #define AR_PHY_DFT_TONE_CTL_1    (AR_SM1_BASE + 0xd4)
- #define AR_PHY_CL_TAB_1          (AR_SM1_BASE + 0x100)
- #define AR_PHY_CHAN_INFO_GAIN_1  (AR_SM1_BASE + 0x180)
- #define AR_PHY_TPC_4_B1          (AR_SM1_BASE + 0x204)
- #define AR_PHY_TPC_5_B1          (AR_SM1_BASE + 0x208)
- #define AR_PHY_TPC_6_B1          (AR_SM1_BASE + 0x20c)
- #define AR_PHY_TPC_11_B1         (AR_SM1_BASE + 0x220)
- #define AR_PHY_PDADC_TAB_1       (AR_SM1_BASE + 0x240)
+ #define AR_PHY_SWITCH_CHAIN_1   (AR_SM1_BASE + 0x84)
+ #define AR_PHY_FCAL_2_1         (AR_SM1_BASE + 0xd0)
+ #define AR_PHY_DFT_TONE_CTL_1   (AR_SM1_BASE + 0xd4)
+ #define AR_PHY_CL_TAB_1         (AR_SM1_BASE + 0x100)
+ #define AR_PHY_CHAN_INFO_GAIN_1 (AR_SM1_BASE + 0x180)
+ #define AR_PHY_TPC_4_B1         (AR_SM1_BASE + 0x204)
+ #define AR_PHY_TPC_5_B1         (AR_SM1_BASE + 0x208)
+ #define AR_PHY_TPC_6_B1         (AR_SM1_BASE + 0x20c)
+ #define AR_PHY_TPC_11_B1        (AR_SM1_BASE + 0x220)
+ #define AR_PHY_PDADC_TAB_1    (AR_SM1_BASE + (AR_SREV_AR9300(ah) ? \
+                                       0x240 : 0x280))
+ #define AR_PHY_TPC_19_B1      (AR_SM1_BASE + 0x240)
+ #define AR_PHY_TPC_19_B1_ALPHA_THERM          0xff
+ #define AR_PHY_TPC_19_B1_ALPHA_THERM_S                0
  #define AR_PHY_TX_IQCAL_STATUS_B1   (AR_SM1_BASE + 0x48c)
 -#define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i)    (AR_SM_BASE + 0x450 + ((_i) << 2))
 +#define AR_PHY_TX_IQCAL_CORR_COEFF_B1(_i)    (AR_SM1_BASE + 0x450 + ((_i) << 2))
  
+ /* SM 1 AIC Registers */
+ 
+ #define AR_PHY_AIC_CTRL_0_B1  (AR_SM1_BASE + 0x4b0)
+ #define AR_PHY_AIC_CTRL_1_B1  (AR_SM1_BASE + 0x4b4)
+ #define AR_PHY_AIC_CTRL_2_B1  (AR_SM1_BASE + 0x4b8)
+ #define AR_PHY_AIC_STAT_0_B1  (AR_SM1_BASE + (AR_SREV_9480_10(ah) ? \
+                                       0x4c0 : 0x4c4))
+ #define AR_PHY_AIC_STAT_1_B1  (AR_SM1_BASE + (AR_SREV_9480_10(ah) ? \
+                                       0x4c4 : 0x4c8))
+ #define AR_PHY_AIC_CTRL_4_B1  (AR_SM1_BASE + 0x4c0)
+ #define AR_PHY_AIC_STAT_2_B1  (AR_SM1_BASE + 0x4cc)
+ 
+ #define AR_PHY_AIC_SRAM_ADDR_B1       (AR_SM1_BASE + 0x5f0)
+ #define AR_PHY_AIC_SRAM_DATA_B1       (AR_SM1_BASE + 0x5f4)
+ 
  /*
   * Channel 2 Register Map
   */

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

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

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

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

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

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
index dbf501ca317f51cac690b87a0edb7f8a84145353,4b907a53f97c2639df112b2eb857e14ef778166b..1e48340228ec5fffc9c4e8279d959cf6254c3daf
--- 1/drivers/net/wireless/rt2x00/rt2800usb.c
--- 2/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@@ -538,11 -529,13 +538,12 @@@ static void rt2800usb_txdone(struct rt2
                        entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
                        if (rt2800usb_txdone_entry_check(entry, reg))
                                break;
 +                      entry = NULL;
                }
  
 -              if (!entry || rt2x00queue_empty(queue))
 -                      break;
 -
 -              rt2800_txdone_entry(entry, reg,
 +              if (entry)
-                       rt2800_txdone_entry(entry, reg);
++                      rt2800_txdone_entry(entry, reg,
+                                   rt2800usb_get_txwi(entry));
        }
  }
  

diff --cc include/net/cfg80211.h
Simple merge

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

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

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

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

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

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

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