Merge by hand (whitespace conflicts in libata.h)
[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / cpufreq / cpufreq_performance.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2