tree 098a01c82ce18bf4a27a20c181d6d58da0e72a30
parent bd37e022e334757a5dc1dae41baa29e16befe4ec
parent d7737ce964d944dd07e25b0f569edcd550ede18c
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1472848710 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1472848710 +0200

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