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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

drivers/net/wireless/iwlwifi/iwl3945-base.c

drivers/net/wireless/mac80211_hwsim.c