OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9f30861
851ae31
)
Merge branch 'cfg80211-mac80211-multi-bssid' into mac80211-next
author
Johannes Berg
<johannes.berg@intel.com>
Fri, 25 Jan 2019 11:44:32 +0000
(12:44 +0100)
committer
Johannes Berg
<johannes.berg@intel.com>
Fri, 8 Feb 2019 13:16:35 +0000
(14:16 +0100)
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>
Trivial merge