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)
Merge itto in x86/tsc because an upcoming patch relies on a new
cpuid bit defined in the x86/cpufeature branch.


Trivial merge