tree 64fe15d4db42e0840acea00e4cf7e1855bba9e96
parent 348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b
parent 66efc5a7e3061c3597ac43a8bb1026488d57e66b
author Dave Jones <davej@redhat.com> 1171157789 -0500
committer Dave Jones <davej@redhat.com> 1171157789 -0500

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

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