Merge branches 'pm-cpufreq-fixes' and 'pm-core-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 Sep 2016 20:38:30 +0000 (22:38 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 2 Sep 2016 20:38:30 +0000 (22:38 +0200)
* pm-cpufreq-fixes:
  cpufreq: dt: Add terminate entry for of_device_id tables

* pm-core-fixes:
  PM / runtime: Add _rcuidle suffix to allow rpm_idle() use from idle
  PM / runtime: Add _rcuidle suffix to allow rpm_resume() to be called from idle


Trivial merge