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"

diff --cc drivers/acpi/battery.c
Simple merge

diff --cc drivers/acpi/button.c
Simple merge

diff --cc drivers/acpi/sleep.c
Simple merge