Merge branches 'intel_pstate' and 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 8 Jun 2017 23:25:16 +0000 (01:25 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 8 Jun 2017 23:25:16 +0000 (01:25 +0200)
* 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"

1  2  3 
drivers/acpi/battery.c
drivers/acpi/button.c
drivers/acpi/sleep.c

Simple merge
Simple merge
Simple merge