From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 8 Sep 2021 14:44:15 +0000 (+0200)
Subject: Merge branches 'acpi-pm' and 'acpi-docs'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e543b10cd9d75309c820d2175200d09b2a62f249;p=linux.git

Merge branches 'acpi-pm' and 'acpi-docs'

* acpi-pm:
  ACPI: PM: s2idle: Run both AMD and Microsoft methods if both are supported

* acpi-docs:
  Documentation: ACPI: Align the SSDT overlays file with the code
---

e543b10cd9d75309c820d2175200d09b2a62f249