summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-01-13 13:11:05 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-01-13 13:11:05 +0300
commitdf3a71aba40fbe4bbd0842170e70c236eaed7c40 (patch)
treee63e53db019bfcefab87868b064444336c78ec04 /drivers
parentf64e4275ef7407d5c3eca20436519bbd1f796e40 (diff)
parent77c7248882385397cd7dffe9e1437f59f32ce2de (diff)
parent420a1116aef0e8e12c305508f45ce73e5ae30a09 (diff)
downloadlinux-df3a71aba40fbe4bbd0842170e70c236eaed7c40.tar.xz
Merge branches 'acpi-resource' and 'acpi-video'
Merge an ACPI resource management quirk and an ACPI backlight driver fix for 6.2-rc4: - Skip ACPI IRQ override on Asus Expertbook B2402CBA (Tamim Khan). - Add missing support for manual selection of NVidia-WMI-EC or Apple GMUX backlight in the kernel command line to the ACPI backlight driver (Hans de Goede). * acpi-resource: ACPI: resource: Skip IRQ override on Asus Expertbook B2402CBA * acpi-video: ACPI: video: Allow selecting NVidia-WMI-EC or Apple GMUX backlight from the cmdline