Merge branch 'pm-opp'

* pm-opp:
  cpufreq: OMAP: Register an Energy Model
  cpufreq: imx6q: Register an Energy Model
  opp: no need to check return value of debugfs_create functions
  cpufreq: mediatek: Register an Energy Model
  cpufreq: scmi: Register an Energy Model
  cpufreq: arm_big_little: Register an Energy Model
  cpufreq: scpi: Register an Energy Model
  cpufreq: dt: Register an Energy Model

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

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

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

diff --cc drivers/cpufreq/scmi-cpufreq.c
index c47182f,0d87e14..e6182c8
--- 1/drivers/cpufreq/scmi-cpufreq.c
--- 2/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@@ -11,6 -11,8 +11,7 @@@
  #include <linux/cpu.h>
  #include <linux/cpufreq.h>
  #include <linux/cpumask.h>
 -#include <linux/cpu_cooling.h>
+ #include <linux/energy_model.h>
  #include <linux/export.h>
  #include <linux/module.h>
  #include <linux/pm_opp.h>

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