diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-09 03:40:32 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-09 03:40:32 +0300 |
| commit | 0d22df90c7eadeaf852caca49ae8df9b2c3075a4 (patch) | |
| tree | c6a5abaca26f579492fd0fd3abff06dd99549deb /arch/arm/mach-hisi | |
| parent | aea4156c308670699d74dedb182ebceffb633185 (diff) | |
| parent | fbd78afe34d9cc3a86aff7cc214d9f06e815e63e (diff) | |
| download | linux-0d22df90c7eadeaf852caca49ae8df9b2c3075a4.tar.xz | |
Merge tag 'pm-4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"These revert one problematic commit related to system sleep and fix
one recent intel_pstate regression.
Specifics:
- Revert a recent commit that attempted to avoid spurious wakeups
from suspend-to-idle via ACPI SCI, but introduced regressions on
some systems (Rafael Wysocki).
We will get back to the problem it tried to address in the next
cycle.
- Fix a possible division by 0 during intel_pstate initialization
due to a missing check (Rafael Wysocki)"
* tag 'pm-4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle"
cpufreq: intel_pstate: Avoid division by 0 in min_perf_pct_min()
Diffstat (limited to 'arch/arm/mach-hisi')
0 files changed, 0 insertions, 0 deletions