tree 764542d5535678f9cd985f22416a0b6280203e0e
parent 3c2993b8c6143d8a5793746a54eba8f86f95240f
parent 57caf4ec2b8bfbcb4f738ab5a12eedf3a8786045
parent f3b7eaae1b35eb8077610eb7c7db042c9b0645e1
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1496964316 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1496964316 +0200

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"