[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / drivers / base / dma-mapping.c
2007-02-11  Dave Jones[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
2007-02-09  Tejun Heodevres: device resource management