Merge branch 'master' of...

drivers/net/wireless/ath/ath5k/base.c

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

drivers/net/wireless/ath/ath9k/ar9003_eeprom.h

drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h

drivers/net/wireless/ath/ath9k/hw.c

drivers/net/wireless/ath/ath9k/main.c

drivers/net/wireless/ath/ath9k/xmit.c

drivers/net/wireless/brcm80211/brcmfmac/usb.c

drivers/net/wireless/iwlwifi/Kconfig

drivers/net/wireless/iwlwifi/Makefile

drivers/net/wireless/iwlwifi/iwl-2000.c

drivers/net/wireless/iwlwifi/iwl-6000.c

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

drivers/net/wireless/iwlwifi/iwl-agn-sta.c

drivers/net/wireless/iwlwifi/iwl-drv.c

drivers/net/wireless/iwlwifi/iwl-phy-db.c

drivers/net/wireless/iwlwifi/iwl-phy-db.h

drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c