diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 23:02:10 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 23:02:13 +0300 |
commit | 7e91a122b11bb250d08ab125afd2c232c87502e1 (patch) | |
tree | 9456e1affc0847a4950bd416d5cfbf720a5505af /drivers/acpi/processor_idle.c | |
parent | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff) | |
parent | d4377974062122d6d9be0bbd8a910a0954714194 (diff) | |
download | linux-7e91a122b11bb250d08ab125afd2c232c87502e1.tar.xz |
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.
Diffstat (limited to 'drivers/acpi/processor_idle.c')
0 files changed, 0 insertions, 0 deletions