Merge branch 'master' of...

drivers/net/wireless/ath/ar9170/usb.c

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/ar9003_initvals.h

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

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

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

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

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

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

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

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

drivers/net/wireless/hostap/hostap_80211_rx.c

drivers/net/wireless/hostap/hostap_ioctl.c

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

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

drivers/net/wireless/iwlwifi/iwl-3945.h

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

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