Merge branches 'acpi-pm' and 'acpi-docs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 8 Sep 2021 14:44:15 +0000 (16:44 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 8 Sep 2021 14:44:15 +0000 (16:44 +0200)
commite543b10cd9d75309c820d2175200d09b2a62f249
treeeeaa01522199137eac0dac6181ff674802f8cb57
parent59dc33252ee777e02332774fbdf3381b1d5d5f5d
parentfa209644a7124b3f4cf811ced55daef49ae39ac6
parent17b121ad0c43342bc894632f6710b894849ca372
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