[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
authorDave Jones <davej@redhat.com>
Sun, 11 Feb 2007 01:36:29 +0000 (20:36 -0500)
committerDave Jones <davej@redhat.com>
Sun, 11 Feb 2007 01:36:29 +0000 (20:36 -0500)
Signed-off-by: Dave Jones <davej@redhat.com>

Trivial merge