From: Dave Jones <davej@redhat.com>
Date: Sun, 11 Feb 2007 01:36:29 +0000 (-0500)
Subject: [CPUFREQ] Fix up merge conflicts with recent ACPI changes.
X-Git-Tag: v2.6.21-rc1~95^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1;p=pandora-kernel.git

[CPUFREQ] Fix up merge conflicts with recent ACPI changes.

Signed-off-by: Dave Jones <davej@redhat.com>
---

bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1
Reading git-diff-tree failed