Merge branch 'mac80211' into mac80211-next

This is necessary to merge the new TDLS and mesh patches,
as they depend on some fixes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --cc include/net/cfg80211.h
Simple merge

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

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

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

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