Skip to content
Snippets Groups Projects
Commit 985f2c87 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'net-next/master' into mac80211-next


Merge net-next to get some driver changes that patches depend
on (in order to avoid conflicts).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 4d57c678 6623c60d
No related branches found
No related tags found
Loading
Showing
with 206 additions and 40 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment