Merge branch 'master' of...

Documentation/DocBook/80211.tmpl

MAINTAINERS

drivers/net/wireless/ath/ath.h

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

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

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

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

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

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

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

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

drivers/net/wireless/b43/phy_n.c

drivers/net/wireless/iwlwifi/iwl-1000.c

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

drivers/net/wireless/iwlwifi/iwl-3945-rs.c

drivers/net/wireless/iwlwifi/iwl-3945.c

drivers/net/wireless/iwlwifi/iwl-4965.c