Merge branch 'pm-opp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 1 Nov 2015 23:54:37 +0000 (00:54 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 1 Nov 2015 23:54:37 +0000 (00:54 +0100)
commit394f7164e65a734f815543d918c7bdc0587593a6
tree19e57816a0c95a67e5f8cd20276673bc69df0556
parentdcf3d0183f100a14f60eb5993e124a4a1322ee9a
parenta6eed752f5fb40990eb28fddb2b93258fb7e3be0
Merge branch 'pm-opp'

* pm-opp:
  PM / OPP: passing NULL to PTR_ERR()
  PM / OPP: Move cpu specific code to opp/cpu.c
  PM / OPP: Move opp core to its own directory
  PM / OPP: Prefix exported opp routines with dev_pm_opp_
  PM / OPP: Rename opp init/free table routines
  PM / OPP: reuse of_parse_phandle()
drivers/base/power/opp/core.c
drivers/cpufreq/Makefile
drivers/cpufreq/imx6q-cpufreq.c