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/Makefile

drivers/net/wireless/airo.c

drivers/net/wireless/at76c50x-usb.c

drivers/net/wireless/at76c50x-usb.h

drivers/net/wireless/ath5k/base.c

drivers/net/wireless/ath5k/base.h

drivers/net/wireless/ath9k/ani.c

drivers/net/wireless/ath9k/ath9k.h

drivers/net/wireless/ath9k/beacon.c

drivers/net/wireless/ath9k/calib.c

drivers/net/wireless/ath9k/calib.h

drivers/net/wireless/ath9k/debug.c

drivers/net/wireless/ath9k/debug.h

drivers/net/wireless/ath9k/eeprom.c

drivers/net/wireless/ath9k/eeprom.h

drivers/net/wireless/ath9k/hw.c

drivers/net/wireless/ath9k/hw.h

drivers/net/wireless/ath9k/mac.c

drivers/net/wireless/ath9k/mac.h