summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-11 15:37:36 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-09-11 15:37:36 +0200
commit4614e0cc66a8ea1d163efc364ba743424dee5c0a (patch)
treef9946cf7b2d4bc111e960db20b880c4068907dd5 /kernel
parent3e66c4b86035884e00f008086b183b925fb0592b (diff)
parent21dd33b09c61597df603c654589adffd7955491a (diff)
parentabceaa9cded5f059f8c3b3b6f32730084fe5e39f (diff)
parentf33b77408a91d4427374010897b90af678dc47be (diff)
Merge branches 'pm-cpu', 'pm-cpuidle' and 'pm-domains'
* 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()