diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-11 15:37:36 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-11 15:37:36 +0200 |
| commit | 4614e0cc66a8ea1d163efc364ba743424dee5c0a (patch) | |
| tree | f9946cf7b2d4bc111e960db20b880c4068907dd5 | |
| parent | 3e66c4b86035884e00f008086b183b925fb0592b (diff) | |
| parent | 21dd33b09c61597df603c654589adffd7955491a (diff) | |
| parent | abceaa9cded5f059f8c3b3b6f32730084fe5e39f (diff) | |
| parent | f33b77408a91d4427374010897b90af678dc47be (diff) | |
| download | linux-4614e0cc66a8ea1d163efc364ba743424dee5c0a.tar.bz2 | |
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()