diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-09 01:25:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-09 01:25:16 +0200 |
| commit | fbd78afe34d9cc3a86aff7cc214d9f06e815e63e (patch) | |
| tree | 764542d5535678f9cd985f22416a0b6280203e0e /kernel/power | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f (diff) | |
| parent | 57caf4ec2b8bfbcb4f738ab5a12eedf3a8786045 (diff) | |
| parent | f3b7eaae1b35eb8077610eb7c7db042c9b0645e1 (diff) | |
| download | linux-fbd78afe34d9cc3a86aff7cc214d9f06e815e63e.tar.bz2 | |
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"