Merge branch 'x86/cpufeature' into x86/tsc
authorIngo Molnar <mingo@elte.hu>
Tue, 16 Dec 2008 20:02:10 +0000 (21:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 16 Dec 2008 20:02:13 +0000 (21:02 +0100)
commit7e91a122b11bb250d08ab125afd2c232c87502e1
tree9456e1affc0847a4950bd416d5cfbf720a5505af
parent1bda71282ded6a2e09a2db7c8884542fb46bfd4f
parentd4377974062122d6d9be0bbd8a910a0954714194
Merge branch 'x86/cpufeature' into x86/tsc

Merge itto in x86/tsc because an upcoming patch relies on a new
cpuid bit defined in the x86/cpufeature branch.