[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[cascardo/linux.git] / include / sound / sscape_ioctl.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2