Merge branch 'pm-opp-next' into linux-next

* pm-opp-next:
  PM / OPP: rename header to linux/pm_opp.h
  PM / OPP: rename data structures to dev_pm equivalents
  PM / OPP: rename functions to dev_pm_opp*

Conflicts:
	drivers/cpufreq/omap-cpufreq.c
	drivers/devfreq/exynos/exynos5_bus.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/omap-cpufreq.c
index 58b2200ec780abfb09794e023c461d3903bf07ed,20190f56594fbabd99ecf7e9530395e473ab9f05..ac552d090463d729d4ef0b98aebe893c554ae02c
--- 1/drivers/cpufreq/omap-cpufreq.c
--- 2/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@@ -166,14 -173,20 +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/devfreq/exynos/exynos5_bus.c
index 93c29f4085bdc8687e1957bb2df7366b2797a182,52835f12ac98c5feb3caab3c441298b7902a5263..9e3752dac99e5115bbe2df05694c06e8ca7fe2a8
--- 1/drivers/devfreq/exynos/exynos5_bus.c
--- 2/drivers/devfreq/exynos/exynos5_bus.c
+++ b/drivers/devfreq/exynos/exynos5_bus.c
@@@ -15,12 -15,13 +15,12 @@@
  #include <linux/module.h>
  #include <linux/devfreq.h>
  #include <linux/io.h>
- #include <linux/opp.h>
 -#include <linux/pm_opp.h>
  #include <linux/slab.h>
  #include <linux/suspend.h>
 -#include <linux/pm_opp.h>
  #include <linux/clk.h>
  #include <linux/delay.h>
  #include <linux/platform_device.h>
++#include <linux/pm_opp.h>
  #include <linux/pm_qos.h>
  #include <linux/regulator/consumer.h>
  #include <linux/of_address.h>