aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-16 21:02:10 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-16 21:02:13 +0100
commit7e91a122b11bb250d08ab125afd2c232c87502e1 (patch)
tree9456e1affc0847a4950bd416d5cfbf720a5505af /drivers/acpi
parent1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff)
parentd4377974062122d6d9be0bbd8a910a0954714194 (diff)
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')
0 files changed, 0 insertions, 0 deletions