[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / include / asm-x86_64 / cpu.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2