Merge back earlier 'pm-cpufreq' material

diff --cc drivers/cpufreq/cpufreq_conservative.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_governor.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_governor.h
Simple merge

diff --cc drivers/cpufreq/cpufreq_ondemand.c
Simple merge

diff --cc drivers/cpufreq/loongson2_cpufreq.c
Simple merge