From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 2 Sep 2016 20:38:30 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq-fixes' and 'pm-core-fixes'
X-Git-Tag: v4.8-rc5~15^2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=b654c62e7734cdcd507a5751cd940077be2ad373

Merge branches 'pm-cpufreq-fixes' and 'pm-core-fixes'

* 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
---

b654c62e7734cdcd507a5751cd940077be2ad373