Merge branch 'master' of...

drivers/net/wireless/Makefile

drivers/net/wireless/airo.c

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

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

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

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

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

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

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

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

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

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

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_beacon.c

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