]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59dc332 fa20964 17b121a)
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)
* 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


Trivial merge
Linux Kernel Source Tree.