diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-10-04 19:06:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-10-04 19:06:44 +0200 |
| commit | 3be5c171025baece9a0793170eb3b47ad08bf6c9 (patch) | |
| tree | 5156987756156a9aa2c1d19b3bacc190f66cbb21 | |
| parent | 056301e7c7c886f96d799edd36f3406cc30e1822 (diff) | |
| parent | ac78288fe062b64e45a479eaae74aaaafcc8ecdd (diff) | |
| parent | 76959aff14a0012ad6b984ec7686d163deccdc16 (diff) | |
Merge branches 'acpi-video' and 'acpi-battery'
Merge an ACPI backlight (video) quirk and ACPI battery driver fix and
cleanup for 6.12-rc2:
- Add a quirk for Dell OptiPlex 5480 AIO to the ACPI backlight (video)
driver (Hans de Goede).
- Prevent the ACPI battery driver from crashing when unregistering a
battery hook and simplify battery hook locking in it (Armin Wolf).
* acpi-video:
ACPI: video: Add backlight=native quirk for Dell OptiPlex 5480 AIO
* acpi-battery:
ACPI: battery: Fix possible crash when unregistering a battery hook
ACPI: battery: Simplify battery hook locking