OSDN Git Service

(root) / tomoyo / tomoyo-test1.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21fc506 2c5a06e 55f4f6e)
Merge branches 'acpi-utils' and 'acpi-docs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 24 Apr 2023 16:07:56 +0000 (18:07 +0200)
committerRafael 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
This is a test repository.
About OSDN
Find Software
Develop Software
Help