]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc980e58085dc44f54cdae55d362434137d93ba46
tree764542d5535678f9cd985f22416a0b6280203e0e
parente9e02ea9c2ec5186bb77a8d5bc3b7bee407a45bb
parentfcc225853e48a3d09828972ad15e2b2e5a6c937d
parentb6fe79197f9252f8f5c5e15e542b6edde3bcb9d0
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"
drivers/acpi/battery.c
drivers/acpi/button.c
drivers/acpi/sleep.c