Skip to content
Commit 66a61fc0 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' into upstream 

Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
parents 8db089d1 d37e4496
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment