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

arch/powerpc/configs/ppc64_defconfig

arch/powerpc/configs/ps3_defconfig

drivers/net/Kconfig

drivers/net/ps3_gelic_wireless.c

drivers/net/wireless/airo.c

drivers/net/wireless/ath/ath.h

drivers/net/wireless/ath/ath5k/ath5k.h

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

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

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

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

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

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

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

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

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

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/main.c