From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 4 Mar 2019 10:17:28 +0000 (+0100)
Subject: Merge branches 'acpi-video' and 'acpi-x86'
X-Git-Tag: v5.1-rc1~150^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8167e00e9e35ad90f62e2e424c80c9bc4f3adf7b;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'acpi-video' and 'acpi-x86'

* acpi-video:
  ACPI / video: Extend chassis-type detection with a "Lunch Box" check
  ACPI / video: Refactor and fix dmi_is_desktop()

* acpi-x86:
  ACPI / x86: Make PWM2 device always present at Lenovo Yoga Book
---

8167e00e9e35ad90f62e2e424c80c9bc4f3adf7b