[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[sfrench/cifs-2.6.git] / arch / mips / philips /
drwxr-xr-x   ..
drwxr-xr-x - pnx8550