diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-09-08 16:44:15 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-09-08 16:44:15 +0200 |
| commit | e543b10cd9d75309c820d2175200d09b2a62f249 (patch) | |
| tree | eeaa01522199137eac0dac6181ff674802f8cb57 /drivers/pci | |
| parent | 59dc33252ee777e02332774fbdf3381b1d5d5f5d (diff) | |
| parent | fa209644a7124b3f4cf811ced55daef49ae39ac6 (diff) | |
| parent | 17b121ad0c43342bc894632f6710b894849ca372 (diff) | |
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