diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-29 21:45:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-29 21:45:17 +0100 |
| commit | ad1ac94767aa9d74c6533e33e768a14d2715162f (patch) | |
| tree | a6dfd798140f14bf018732e6e3ad857b69c294e9 /kernel | |
| parent | 0bce39ccb2efab511dd1a08e3a3b4b5e1590ec9f (diff) | |
| parent | 75274b33e779ae40a750bcb4bd0b07c4dfef4746 (diff) | |
| parent | b331bc20d9281213f7fb67912638e0fb5baeb324 (diff) | |
| parent | a3d09c73492e57a1189e410f67e4d2115b23a3a8 (diff) | |
| parent | 993e9fe1e70aedbb6e9670211f1ad56beea8373d (diff) | |
Merge branches 'pm-cpuidle', 'pm-cpufreq', 'pm-domains' and 'pm-sleep'
* pm-cpuidle:
cpuidle: coupled: remove unused define cpuidle_coupled_lock
cpuidle: fix fallback mechanism for suspend to idle in absence of enter_freeze
* pm-cpufreq:
cpufreq: cpufreq-dt: avoid uninitialized variable warnings:
cpufreq: pxa2xx: fix pxa_cpufreq_change_voltage prototype
cpufreq: Use list_is_last() to check last entry of the policy list
cpufreq: Fix NULL reference crash while accessing policy->governor_data
* pm-domains:
PM / Domains: Fix typo in comment
PM / Domains: Fix potential deadlock while adding/removing subdomains
PM / domains: fix lockdep issue for all subdomains
* pm-sleep:
PM: APM_EMULATION does not depend on PM