summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-06-01 17:19:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-06-01 17:19:43 +0200
commit48ccdeddc54771ecdc46fac098bac689e9df24ca (patch)
tree6ab2400d04e20b72dc1e512a8c5481fb96cc5db5 /arch
parent228b79aa33ba657460a9465596d8546c4d811dd4 (diff)
parent8fcc4ae6faf8b455eeef00bc9ae70744e3b0f462 (diff)
parentcc0594c4b0ef280dd7bdceab1a7c940d356f494d (diff)
parentc41c36e900a337b4132b12ccabc97f5578248b44 (diff)
parent7b52b200cf5bdd04f3ee22121960bd6f4ec5efa1 (diff)
Merge branches 'acpi-apei', 'acpi-pmic', 'acpi-video' and 'acpi-dptf'
* acpi-apei: arm64: acpi: Make apei_claim_sea() synchronise with APEI's irq work ACPI: APEI: Kick the memory_failure() queue for synchronous errors mm/memory-failure: Add memory_failure_queue_kick() * acpi-pmic: ACPI / PMIC: Add i2c address for thermal control * acpi-video: ACPI: video: Use native backlight on Acer TravelMate 5735Z * acpi-dptf: ACPI: DPTF: Add battery participant driver ACPI: DPTF: Additional sysfs attributes for power participant driver