Merge tag 'mac80211-next-for-john-2014-09-12' of git://git.kernel.org/pub/scm/linux...

Johannes Berg <johannes@sipsolutions.net> says:

"This time, I have some rate minstrel improvements, support for a very
small feature from CCX that Steinar reverse-engineered, dynamic ACK
timeout support, a number of changes for TDLS, early support for radio
resource measurement and many fixes. Also, I'm changing a number of
places to clear key memory when it's freed and Intel claims copyright
for code they developed."

Conflicts:
	net/mac80211/iface.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

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

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

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

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

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

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