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

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

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

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

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

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

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

drivers/net/wireless/ath/carl9170/usb.c

include/net/cfg80211.h

net/wireless/chan.c