]> 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)
commit43c9b4013389c928778014dbe51d026266654a92
tree8579f3c4e30e52da6966ac9942c79b72a24ffd2a
parentc9130d2b4d5f1d3dab8754cea406c6c1c7741ff6
parenta91229b9a7cf74495f22fb5bdc4d30e44f4094be
parenta0371087253a62be245161fc6425d369a2dcf240
parent1ae3fa4eb31e4541268d2a8d942953613ebfc85f
parent728d0977ec3cbb853ca4ce6fb392cd4ee338e305
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