summaryrefslogtreecommitdiff
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-05-09 23:21:46 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-05-09 23:21:46 +0200
commit80449d89d4d6d0af4d6d310597e0f4a3fe0c08a9 (patch)
tree8579f3c4e30e52da6966ac9942c79b72a24ffd2a /drivers/acpi/battery.c
parent08be881064da126b8df4b96b0b3e2e307969a4a1 (diff)
parent5e68ebd0ac4842977c127160f9ecf1a0099f502f (diff)
parent1b2e87687d3f951a66900cab6f1583d94099d2f7 (diff)
parenteed4d47efe9508b855b09754cf6de4325d8a2f0d (diff)
parent4486740da2e1cb307f58e0e62f94c92ec7c101a1 (diff)
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