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

drivers/net/wireless/Kconfig

drivers/net/wireless/at76c50x-usb.c

drivers/net/wireless/ath/Kconfig

drivers/net/wireless/ath/Makefile

drivers/net/wireless/ath/ar9170/ar9170.h

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

drivers/net/wireless/ath/ar9170/cmd.h

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

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

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

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

drivers/net/wireless/ath/ath.h

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

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

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

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

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

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

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

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