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

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

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

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

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

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

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

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

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

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

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

drivers/net/wireless/ath/key.c

drivers/net/wireless/ipw2x00/ipw2100.c

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

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

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

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

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

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

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

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