summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-23 19:16:56 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-23 19:16:56 +0300
commit2818cc745445ae5866598fe45fe563ef843e30af (patch)
tree018b461ba75708d5266f9854c9d14d53de1a84d1 /drivers/acpi
parent652af650d3f619363f64edc69794f6141bdf492b (diff)
parent0fada277147ffc6d694aa32162f51198d4f10d94 (diff)
parent9a4888888cc09b0ff3d0a1dd32df88742d29a293 (diff)
parentd85cc6635a2a1338f7a45f652e97b02f9a69b9f5 (diff)
parentd7a4a85c9a34b8edc3e2f6e64caf5c97c8bdcce4 (diff)
parentabcba2e135ec45a54580c80e5e14bbc2911ba231 (diff)
downloadlinux-2818cc745445ae5866598fe45fe563ef843e30af.tar.xz
Merge branches 'acpi-debug', 'acpi-reboot', 'acpi-processor', 'acpi-dptf' and 'acpi-utils'
* acpi-debug: ACPI: debug: don't allow debugging when ACPI is disabled * acpi-reboot: ACPI: reboot: Avoid racing after writing to ACPI RESET_REG * acpi-processor: ACPI: processor: remove comment regarding string _UID support * acpi-dptf: ACPI: DPTF: Add ACPI_DPTF Kconfig menu ACPI: DPTF: Fix participant driver names * acpi-utils: ACPI: utils: remove unreachable breaks