]> asedeno.scripts.mit.edu Git - linux.git/commit
projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f30861 851ae31)
Merge branch 'cfg80211-mac80211-multi-bssid' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 25 Jan 2019 11:44:32 +0000 (12:44 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 8 Feb 2019 13:16:35 +0000 (14:16 +0100)
commitdb33aa7ea69da1209d755e959163f82d2176b782
treeaa7642523bd4ed1b9e370e5f43ff02baa9b647cftree | snapshot
parent9f308616b6176b6dc470e6eb3569a09b100a823acommit | diff
parent851ae31d34063deb1eae49f5d797a12a5557e832commit | 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>
local clone of linux.git