Merge back earlier 'pm-cpufreq' material.

Conflicts:
	drivers/cpufreq/omap-cpufreq.c

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

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

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

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

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

diff --cc drivers/cpufreq/omap-cpufreq.c
index 20190f56594fbabd99ecf7e9530395e473ab9f05,58b2200ec780abfb09794e023c461d3903bf07ed..ac552d090463d729d4ef0b98aebe893c554ae02c
--- 1/drivers/cpufreq/omap-cpufreq.c
--- 2/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@@ -173,20 -166,14 +166,14 @@@ static int omap_cpu_init(struct cpufreq
        if (IS_ERR(mpu_clk))
                return PTR_ERR(mpu_clk);
  
-       if (policy->cpu >= NR_CPUS) {
-               result = -EINVAL;
-               goto fail_ck;
-       }
- 
-       policy->cur = omap_getspeed(policy->cpu);
- 
-       if (!freq_table)
+       if (!freq_table) {
 -              result = opp_init_cpufreq_table(mpu_dev, &freq_table);
 +              result = dev_pm_opp_init_cpufreq_table(mpu_dev, &freq_table);
- 
-       if (result) {
-               dev_err(mpu_dev, "%s: cpu%d: failed creating freq table[%d]\n",
+               if (result) {
+                       dev_err(mpu_dev,
+                               "%s: cpu%d: failed creating freq table[%d]\n",
                                __func__, policy->cpu, result);
-               goto fail_ck;
+                       goto fail;
+               }
        }
  
        atomic_inc_return(&freq_table_users);

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

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