Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>