diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-05 22:57:31 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-05-05 22:57:31 +0200 |
commit | c2d1a8fd16dc72fcf9d0102f807d7296c8ee4b95 (patch) | |
tree | 5213e13359a4c02c5c3fce03937e9139363f8682 /Documentation | |
parent | cbd1b15e81dfaf70b542904565c21264ba32d30d (diff) | |
parent | 5e68ebd0ac4842977c127160f9ecf1a0099f502f (diff) | |
parent | 1b2e87687d3f951a66900cab6f1583d94099d2f7 (diff) | |
parent | 4486740da2e1cb307f58e0e62f94c92ec7c101a1 (diff) | |
parent | eed4d47efe9508b855b09754cf6de4325d8a2f0d (diff) |
Merge branches 'pm-domains', 'pm-cpuidle', 'powercap' and 'pm-sleep' into linux-next
* pm-domains:
PM / Domains: Add DT file to MAINTAINERS
PM / Domains: Fix DT example
* pm-cpuidle:
x86/intel_idle: add Gemini Lake support
cpuidle: check dev before usage in cpuidle_use_deepest_state()
* powercap:
powercap: intel_rapl: Add support for Gemini Lake
* pm-sleep:
ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle
PM / wakeup: Integrate mechanism to abort transitions in progress