Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Mon, 8 Oct 2018 07:48:31 +0000 (09:48 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 8 Oct 2018 07:48:36 +0000 (09:48 +0200)
commit188de5dd80b2b7986e75821374efb67081049b6e
tree545bbc0fdb58f30c0175128e3b5a9c00c89e2020
parent5207ca554bfcb5a32959eb12b6aff8f64384492c
parentabf1a08ff3237a27188ff8cc2904f2cea893af55
Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
include/net/cfg80211.h
net/wireless/nl80211.c
net/wireless/reg.c