Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>