diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-24 18:07:56 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-24 18:07:56 +0200 |
| commit | 4f810294e00bd99da9ec3c8fe3185a73e39bcd6c (patch) | |
| tree | 1afa620630bfcda3d19f0d7260617c61f999f517 /include/acpi | |
| parent | 21fc506cf5ef5de9c2cdc04036e35169d2b3e7d6 (diff) | |
| parent | 2c5a06e5505a716387a4d86f1f39de506836435a (diff) | |
| parent | 55f4f6ead46c0c5c5cd98395a4422509da063e0d (diff) | |
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