projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
21fc506
2c5a06e
55f4f6e
)
Merge branches 'acpi-utils' and 'acpi-docs'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Mon, 24 Apr 2023 16:07:56 +0000
(18:07 +0200)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Mon, 24 Apr 2023 16:07:56 +0000
(18:07 +0200)
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
Trivial merge