Merge branch 'master' of...

Documentation/DocBook/80211.tmpl

drivers/net/wireless/hostap/hostap_ap.c

drivers/net/wireless/iwlwifi/dvm/commands.h

drivers/net/wireless/iwlwifi/dvm/tt.c

drivers/net/wireless/iwlwifi/dvm/tx.c

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

drivers/net/wireless/iwlwifi/mvm/mac80211.c

drivers/net/wireless/iwlwifi/mvm/rx.c

drivers/net/wireless/iwlwifi/mvm/scan.c

drivers/net/wireless/iwlwifi/mvm/sta.c

drivers/net/wireless/iwlwifi/mvm/sta.h

drivers/net/wireless/iwlwifi/mvm/time-event.c

drivers/net/wireless/mwifiex/11ac.c

drivers/net/wireless/mwifiex/11ac.h

drivers/net/wireless/mwifiex/11n.c

drivers/net/wireless/mwifiex/11n.h

drivers/net/wireless/mwifiex/Makefile

drivers/net/wireless/mwifiex/cfg80211.c

drivers/net/wireless/mwifiex/cfp.c

drivers/net/wireless/mwifiex/cmdevt.c