summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-04-02 16:57:56 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-04-02 16:57:56 +0200
commit91463ebff32d3e6fc71134784ae6aa91402bfe3d (patch)
tree6d0d63cf617d3cb8bd15cf90e9f08dc69244ba77 /arch
parent8cdddd182bd7befae6af49c5fd612893f55d6ccb (diff)
parent1a1c130ab7575498eed5bcf7220037ae09cd1f8a (diff)
parent3e759425cc3cf9a43392309819d34c65a3644c59 (diff)
downloadlinux-91463ebff32d3e6fc71134784ae6aa91402bfe3d.tar.bz2
Merge branches 'acpi-tables' and 'acpi-scan'
* acpi-tables: ACPI: tables: x86: Reserve memory occupied by ACPI tables * acpi-scan: ACPI: scan: Fix _STA getting called on devices with unmet dependencies