Merge branches 'pm-cpu', 'pm-cpuidle' and 'pm-domains'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Sep 2015 13:37:36 +0000 (15:37 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Sep 2015 13:37:36 +0000 (15:37 +0200)
* pm-cpu:
  kernel/cpu_pm: fix cpu_cluster_pm_exit comment

* pm-cpuidle:
  cpuidle/coupled: Add sanity check for safe_state_index

* pm-domains:
  staging: board: Migrate away from __pm_genpd_name_add_device()
  PM / Domains: Ensure subdomain is not in use before removing
  PM / Domains: Try power off masters in error path of __pm_genpd_poweron()


Trivial merge