Skip to content
Commit db33aa7e authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parents 9f308616 851ae31d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment