[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / arch / m68knommu / platform / 520x /
drwxr-xr-x   ..
-rw-r--r-- 468 Makefile
-rw-r--r-- 1867 config.c