summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-13 15:45:36 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-13 15:45:36 +0300
commit8be2362d10e8b0ea9844706d8c388480d37226d2 (patch)
tree39a9d2b952d0045999ce97a3347d59048ed379a7
parent5d2a3ca813f3d1dbebc39e8ad3f8ebd01b1ff627 (diff)
parent7cecb47f55e00282f972a1e0b09136c8cd938221 (diff)
parentc18483a8ed30712630bc91bb9ea035cc9e1dfef0 (diff)
parent21988a8e51479ceffe7b0568b170effabb708dfe (diff)
parent05c36e5adf2beae64d118f49fcaafbe8ce373db1 (diff)
parent8e8883cef6cea03fca63591624d6627a3e7a6eab (diff)
downloadlinux-8be2362d10e8b0ea9844706d8c388480d37226d2.tar.xz
Merge branches 'acpi-extlog', 'acpi-memhotplug', 'acpi-button', 'acpi-tools' and 'acpi-pci'
* acpi-extlog: ACPI / extlog: Check for RDMSR failure * acpi-memhotplug: ACPI: memhotplug: Remove 'state' from struct acpi_memory_device * acpi-button: ACPI: button: fix handling lid state changes when input device closed * acpi-tools: tools/power/acpi: Serialize Makefile * acpi-pci: ACPI: PCI: update kernel-doc line comments