aboutsummaryrefslogtreecommitdiffstats
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
parentMerge branch 'pm-cpufreq' (diff)
parentkernel/cpu_pm: fix cpu_cluster_pm_exit comment (diff)
parentcpuidle/coupled: Add sanity check for safe_state_index (diff)
parentstaging: board: Migrate away from __pm_genpd_name_add_device() (diff)
downloadlinux-dev-4614e0cc66a8ea1d163efc364ba743424dee5c0a.tar.xz
linux-dev-4614e0cc66a8ea1d163efc364ba743424dee5c0a.zip
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()