summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2025-11-06 22:10:27 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2025-11-06 22:10:27 +0100
commit771e8f483583728cd2ef164f7c2256c4bf2adf4c (patch)
tree79a08dec73d7b92356be1b3e15203d9bbc0d6bf9
parent01e11d18da818eabdb3769081e7123ed8bfe863c (diff)
parent1642fabff19f768e9a8fea85d55a2d6d43ecffe3 (diff)
parentbd9e119951b527724938ff55fb0ca3daa54f5c18 (diff)
downloadlinux-771e8f483583728cd2ef164f7c2256c4bf2adf4c.tar.gz
linux-771e8f483583728cd2ef164f7c2256c4bf2adf4c.tar.bz2
linux-771e8f483583728cd2ef164f7c2256c4bf2adf4c.zip
Merge branches 'acpi-cppc' and 'acpi-docs'
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