From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 3 May 2023 13:55:19 +0000 (+0200)
Subject: Merge branches 'acpi-pm' and 'acpi-properties'
X-Git-Tag: v6.4-rc1~46^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e70a47ceafe4d71a4a402b2f7c5123cb4bf33f6;p=thirdparty%2Fkernel%2Flinux.git

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
---

2e70a47ceafe4d71a4a402b2f7c5123cb4bf33f6