| commit | db33aa7ea69da1209d755e959163f82d2176b782 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Fri Jan 25 12:44:32 2019 +0100 |
| committer | Johannes Berg <johannes.berg@intel.com> | Fri Feb 08 14:16:35 2019 +0100 |
| tree | aa7642523bd4ed1b9e370e5f43ff02baa9b647cf | |
| parent | 9f308616b6176b6dc470e6eb3569a09b100a823a [diff] | |
| parent | 851ae31d34063deb1eae49f5d797a12a5557e832 [diff] |
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>