]> err.no Git - linux-2.6/commit
[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)
commitbd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1
tree64fe15d4db42e0840acea00e4cf7e1855bba9e96
parent348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b
parent66efc5a7e3061c3597ac43a8bb1026488d57e66b
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.

Signed-off-by: Dave Jones <davej@redhat.com>
arch/i386/kernel/cpu/cpufreq/longhaul.c