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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/iwlegacy/4965-mac.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/d3.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/scan.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/sta.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfp.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/join.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sdio.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sta_ioctl.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge