tree 28ebaaee56786cd9199e0e5802d166474d30d1e3
parent 8db089d1b08209c04cd130e49fa4796b5513ce7f
parent d37e44969e60dc652fdbaf4397d5436e07c967af
author Jiri Kosina <jkosina@suse.cz> 1346079864 -0700
committer Jiri Kosina <jkosina@suse.cz> 1346079917 -0700

Merge branch 'master' into upstream

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