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

MAINTAINERS

drivers/net/wireless/ath/ath5k/Kconfig

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

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

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

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

drivers/net/wireless/ath/ath5k/mac80211-ops.c

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

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

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

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

drivers/net/wireless/ath/ath9k/Makefile

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

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

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

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

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