From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 4 Oct 2024 17:06:44 +0000 (+0200)
Subject: Merge branches 'acpi-video' and 'acpi-battery'
X-Git-Tag: v6.12-rc2~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3be5c171025baece9a0793170eb3b47ad08bf6c9;p=thirdparty%2Flinux.git

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
---

3be5c171025baece9a0793170eb3b47ad08bf6c9