From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 25 Jan 2019 11:44:32 +0000 (+0100)
Subject: Merge branch 'cfg80211-mac80211-multi-bssid' into mac80211-next
X-Git-Tag: v5.1-rc1~178^2~133^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db33aa7ea69da1209d755e959163f82d2176b782;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'cfg80211-mac80211-multi-bssid' into mac80211-next

This finally merges the multi-BSSID code. This is the result of a
long collaboration between the team at Qualcomm (Peng and Jouni)
and our team at Intel (mostly Sara).

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

db33aa7ea69da1209d755e959163f82d2176b782