diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-05-03 16:55:19 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-05-03 16:55:19 +0300 |
| commit | 2e70a47ceafe4d71a4a402b2f7c5123cb4bf33f6 (patch) | |
| tree | 828e3180794d2abe8cae8291044cf46b2117bc73 /drivers/acpi/x86 | |
| parent | 61711941d8515c6d2a8a95d89e132902b56feebd (diff) | |
| parent | 9b04d99788cf475cbd277f30ec66230ccb7e99f4 (diff) | |
| parent | 9bde7fb8940f636f4338bf233883ae37844dcdb7 (diff) | |
| download | linux-2e70a47ceafe4d71a4a402b2f7c5123cb4bf33f6.tar.xz | |
Merge branches 'acpi-pm' and 'acpi-properties'
Merge an ACPI power management quirk and a change related to the
handling of ACPI device properties for 6.4-rc1:
- Do not turn off unused power resources during initialization on the
Toshiba Click Mini (Hans de Goede).
- Support strings in device properties supplied by ACPI _DSM on Apple
platforms (Hector Martin).
* acpi-pm:
ACPI: PM: Do not turn of unused power resources on the Toshiba Click Mini
* acpi-properties:
ACPI: property: Support strings in Apple _DSM props