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

Johannes Berg <johannes@sipsolutions.net> says:

"Not that much content this time. Some RCU cleanups, crypto
performance improvements, and various patches all over,
rather than listing them one might as well look into the
git log instead."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Conflicts:
	drivers/net/wireless/ath/wil6210/wmi.c

diff --cc drivers/net/wireless/ath/wil6210/wmi.c
Simple merge

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

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

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