]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08be881 5e68ebd 1b2e876 eed4d47 4486740)
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)
* 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

1  2  3  4  5 
MAINTAINERS patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
drivers/acpi/battery.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/acpi/battery.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.