Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Documentation/networking/mac80211-injection.txt

drivers/net/wireless/Kconfig

drivers/net/wireless/Makefile

drivers/net/wireless/ath/ath.h

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

drivers/net/wireless/ath/ath9k/Makefile

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

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

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

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

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

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

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

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

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

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

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

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

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

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