commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 | [log] [tgz] |
---|---|---|
author | Dave Jones <davej@redhat.com> | Sat Feb 10 20:36:29 2007 -0500 |
committer | Dave Jones <davej@redhat.com> | Sat Feb 10 20:36:29 2007 -0500 |
tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 | |
parent | 348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b [diff] | |
parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b [diff] |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes. Signed-off-by: Dave Jones <davej@redhat.com>