Merge branch 'pm-cpufreq-thermal' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jan 2018 01:52:42 +0000 (02:52 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jan 2018 01:52:42 +0000 (02:52 +0100)
commitf06970f4b03dffeb9831a8ad605db3c85a55aca1
treea4477a4878350d63e3399e7f0d57d64e26065f09
parent343a8d17fa8d6dd97f408e8fedbcef12073f3774
parentac89c400ebb146604e718b3fa168c15592e73a8c
Merge branch 'pm-cpufreq-thermal' into pm-cpufreq

* pm-cpufreq-thermal:
  cpu_cooling: Remove static-power related documentation
  cpu_cooling: Drop static-power related stuff
  cpu_cooling: Keep only one of_cpufreq*cooling_register() helper
  cpu_cooling: Remove unused cpufreq_power_cooling_register()
  cpu_cooling: Make of_cpufreq_power_cooling_register() parse DT
drivers/cpufreq/mediatek-cpufreq.c