Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'mac80211' into mac80211-next 



This was needed to avoid conflicts in the minstrel changes.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents b08cc24e 11b2357d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment