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

drivers/net/ps3_gelic_wireless.c

drivers/net/wireless/ath/Kconfig

drivers/net/wireless/ath/ath9k/Kconfig

drivers/net/wireless/ath/ath9k/Makefile

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

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

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

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

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

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

drivers/net/wireless/ath/ath9k/htc_drv_beacon.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_drv_txrx.c

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

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

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

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

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

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