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

Merge wireless into wireless-next



There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 7d528eaf f7e60032
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment