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

Browse source

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

...

This commit is contained in:

Rafael J. Wysocki 2023-04-24 18:07:56 +02:00

parent 21fc506cf5 2c5a06e550 55f4f6ead4

commit 4f810294e0

2 changed files with 13 additions and 10 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

3

include/acpi/acpi_bus.h

View file