diff options
| author | Rafael J. Wysocki <[email protected]> | 2017-06-08 23:25:16 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2017-06-08 23:25:16 +0000 |
| commit | fbd78afe34d9cc3a86aff7cc214d9f06e815e63e (patch) | |
| tree | 764542d5535678f9cd985f22416a0b6280203e0e /drivers/acpi/button.c | |
| parent | Linux 4.12-rc4 (diff) | |
| parent | cpufreq: intel_pstate: Avoid division by 0 in min_perf_pct_min() (diff) | |
| parent | Revert "ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle" (diff) | |
| download | kernel-fbd78afe34d9cc3a86aff7cc214d9f06e815e63e.tar.gz kernel-fbd78afe34d9cc3a86aff7cc214d9f06e815e63e.zip | |
Merge branches 'intel_pstate' and 'pm-sleep'
* intel_pstate:
cpufreq: intel_pstate: Avoid division by 0 in min_perf_pct_min()
* pm-sleep:
Revert "ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle"