From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 6 Apr 2020 14:23:44 +0000 (+0200)
Subject: Merge branches 'acpi-cppc', 'acpi-video' and 'acpi-drivers'
X-Git-Tag: v5.7-rc1~69^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=33ae7f715e30a674599c7f57dce0512b6051edbf;p=users%2Fjedix%2Flinux-maple.git

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

33ae7f715e30a674599c7f57dce0512b6051edbf