summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-04-06 17:23:44 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-04-06 17:23:44 +0300
commit33ae7f715e30a674599c7f57dce0512b6051edbf (patch)
treed76560d581c28742fa72a37745fdc8b12d5f8fa5 /drivers/acpi
parentfd0360583a4fab45fbb7f1cef9504e9fd82c3737 (diff)
parentb17b80645453f8c3174d5d3b55e590cb6a76ca29 (diff)
parent1c8fbc1f9bfb804ef2f0d4ee9397ab800e33f23a (diff)
parent26d8bec1e97ba218b7d82afadca1c049eb75f773 (diff)
downloadlinux-33ae7f715e30a674599c7f57dce0512b6051edbf.tar.xz
Merge branches 'acpi-cppc', 'acpi-video' and 'acpi-drivers'
* acpi-cppc: ACPI: CPPC: clean up acpi_get_psd_map() * acpi-video: ACPI: video: Use native backlight on Acer Aspire 5783z ACPI: video: Docs update for "acpi_backlight" kernel parameter options * acpi-drivers: thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID ACPI: Update Tiger Lake ACPI device IDs