summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-01-20 18:42:16 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-01-20 18:42:16 +0100
commit3bdd346ebda37f4cb12461d5e83a5b9d575afc63 (patch)
tree5d4c0f9caecf6b62bd9f76a08e9e4213e6e3c00b /drivers
parent81aae5cbd36da836eb65025c798d15e5e28a019b (diff)
parent182da6f2b81a78709c58021542fb694f8ed80774 (diff)
parent8ba5fc4c154aeb3b4620f05543cce426c62ed2de (diff)
Merge branches 'acpi-prm' and 'acpi-video'
Merge an ACPI PRM (platform runtime) support fix and an ACPI backlight quirk for 6.2-rc5: - Check whether EFI runtime is available when registering the ACPI PRM address space handler and when running it (Ard Biesheuvel). - Add backlight=native DMI quirk for Acer Aspire 4810T to the ACPI video driver (Hans de Goede). * acpi-prm: ACPI: PRM: Check whether EFI runtime is available * acpi-video: ACPI: video: Add backlight=native DMI quirk for Acer Aspire 4810T