Merge remote-tracking branch 'net-next/master' into mac80211-next

Bring in net-next which had pulled in net, so I have the changes
from mac80211 and can apply a patch that would otherwise conflict.

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

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

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

diff --cc include/uapi/linux/nl80211.h
Simple merge

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

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

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