From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 8 Jun 2017 23:25:16 +0000 (+0200)
Subject: Merge branches 'intel_pstate' and 'pm-sleep'
X-Git-Tag: v4.12-rc5~29^2
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=fbd78afe34d9cc3a86aff7cc214d9f06e815e63e

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"
---

fbd78afe34d9cc3a86aff7cc214d9f06e815e63e