Merge branch 'master' into upstream

Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.