tree 9456e1affc0847a4950bd416d5cfbf720a5505af
parent 1bda71282ded6a2e09a2db7c8884542fb46bfd4f
parent d4377974062122d6d9be0bbd8a910a0954714194
author Ingo Molnar <mingo@elte.hu> 1229457730 +0100
committer Ingo Molnar <mingo@elte.hu> 1229457733 +0100

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.