]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branches 'acpi-cppc' and 'acpi-docs'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 6 Nov 2025 21:10:27 +0000 (22:10 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 6 Nov 2025 21:10:27 +0000 (22:10 +0100)
Merge two documentation fixes for 6.18-rc5, a commet typo fix in the
ACPI CPPC library (Chu Guangqing) and fixes for two ASL examples in the
firmware guide (Jonas Gorski).

* acpi-cppc:
  ACPI: CPPC: Fix typo in a comment

* acpi-docs:
  Documentation: ACPI: i2c-muxes: fix I2C device references


Trivial merge