]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-domains', 'pm-cpuidle', 'pm-sleep' and 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 9 May 2017 21:21:46 +0000 (23:21 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 9 May 2017 21:21:46 +0000 (23:21 +0200)
commit52325eb2ff5c12447dadbf8e32a84760f1b130cf
tree8579f3c4e30e52da6966ac9942c79b72a24ffd2a
parentc55dc08556bfe33796744fe6d02b0278d9aeb67d
parent84b4da37f02e1dfee32789284d1e00d58565b08c
parentc522612bb00b988d4d127a78e5f47b98bca3bbb0
parenta197cdc8716168659d003c0d46d26086d0efbc1e
parent72a2ad088bdf4c598c8ddf191fc8cd4247523118
Merge branches 'pm-domains', 'pm-cpuidle', 'pm-sleep' and 'powercap'

* pm-domains:
  PM / Domains: Add DT file to MAINTAINERS
  PM / Domains: Fix DT example

* pm-cpuidle:
  x86/intel_idle: add Gemini Lake support
  cpuidle: check dev before usage in cpuidle_use_deepest_state()

* pm-sleep:
  ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle
  PM / wakeup: Integrate mechanism to abort transitions in progress

* powercap:
  powercap: intel_rapl: Add support for Gemini Lake
MAINTAINERS
drivers/acpi/battery.c