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

diff --cc drivers/bluetooth/ath3k.c
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9002_mac.c
index 857ede3a999ca1a902f0a004979503cd3b40c101,a366d6b4626f5fdd0bcf04b1d6b9c6063a70afbd..741b38ddcb378e8cb17dbfe0f79f33516be75527
--- 1/drivers/net/wireless/ath/ath9k/ar9002_mac.c
--- 2/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@@ -134,11 -154,23 +155,24 @@@ static bool ar9002_hw_get_isr(struct at
                if ((s5_s & AR_ISR_S5_TIM_TIMER) &&
                    !(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
                        *masked |= ATH9K_INT_TIM_TIMER;
+ 
+               if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
+                       REG_WRITE(ah, AR_ISR_S5, s5_s);
+                       isr &= ~AR_ISR_GENTMR;
+               }
        }
  
+       if (!(pCap->hw_caps & ATH9K_HW_CAP_RAC_SUPPORTED)) {
+               REG_WRITE(ah, AR_ISR, isr);
+               REG_READ(ah, AR_ISR);
+       }
+ 
+       if (AR_SREV_9100(ah))
+               return true;
+ 
        if (sync_cause) {
 -              ath9k_debug_sync_cause(common, sync_cause);
 +              if (sync_cause_p)
 +                      *sync_cause_p = sync_cause;
                fatal_int =
                        (sync_cause &
                         (AR_INTR_SYNC_HOST1_FATAL | AR_INTR_SYNC_HOST1_PERR))

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

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

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

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