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

drivers/net/wireless/airo.c

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

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

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

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

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

drivers/net/wireless/ath/ath9k/ar9003_mac.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/htc_drv_main.c

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

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

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

drivers/net/wireless/b43/main.c

drivers/net/wireless/b43/phy_g.c

drivers/net/wireless/b43/phy_lp.c

drivers/net/wireless/b43/phy_n.c

drivers/net/wireless/b43/wa.c

drivers/net/wireless/ipw2x00/ipw2100.c