From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 24 Apr 2023 16:07:56 +0000 (+0200)
Subject: Merge branches 'acpi-utils' and 'acpi-docs'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4f810294e00bd99da9ec3c8fe3185a73e39bcd6c;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'acpi-utils' and 'acpi-docs'

Merge ACPI utilities and documentation updates for 6.4-rc1:

 - Fix acpi_evaluate_dsm_typed() redefinition error (Kiran K).

 - Update the pm_profile sysfs attribute documentation (Rafael Wysocki).

* acpi-utils:
  ACPI: utils: Fix acpi_evaluate_dsm_typed() redefinition error

* acpi-docs:
  ACPI: docs: Update the pm_profile sysfs attribute documentation
---

4f810294e00bd99da9ec3c8fe3185a73e39bcd6c