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

Browse source

* 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

...

This commit is contained in:

Rafael J. Wysocki 2021-09-08 16:44:15 +02:00

parent 59dc33252e fa209644a7 17b121ad0c

commit e543b10cd9

2 changed files with 64 additions and 52 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

49

Documentation/admin-guide/acpi/ssdt-overlays.rst

View file

67

drivers/acpi/x86/s2idle.c

View file