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

MAINTAINERS

drivers/net/wireless/adm8211.c

drivers/net/wireless/at76c50x-usb.c

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

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

drivers/net/wireless/ath/ar9170/main.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/base.h

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

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

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

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

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

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

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

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

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

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