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

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

drivers/net/wireless/ath/ath9k/Kconfig

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

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

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

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

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

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

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

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

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

drivers/net/wireless/ath/regd_common.h

drivers/net/wireless/iwlwifi/Kconfig

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

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

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