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

Documentation/DocBook/mac80211.tmpl

Documentation/feature-removal-schedule.txt

MAINTAINERS

drivers/net/wireless/Kconfig

drivers/net/wireless/Makefile

drivers/net/wireless/ar9170/Kconfig

drivers/net/wireless/ar9170/Makefile

drivers/net/wireless/ar9170/ar9170.h

drivers/net/wireless/ar9170/cmd.c

drivers/net/wireless/ar9170/cmd.h

drivers/net/wireless/ar9170/eeprom.h

drivers/net/wireless/ar9170/hw.h

drivers/net/wireless/ar9170/led.c

drivers/net/wireless/ar9170/mac.c

drivers/net/wireless/ar9170/main.c

drivers/net/wireless/ar9170/phy.c

drivers/net/wireless/ar9170/usb.c

drivers/net/wireless/ar9170/usb.h

drivers/net/wireless/ath5k/ath5k.h

drivers/net/wireless/ath5k/attach.c