From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 26 Apr 2018 13:11:39 +0000 (+0200)
Subject: Merge branches 'acpi-watchdog', 'acpi-button' and 'acpi-video'
X-Git-Tag: v4.17-rc3~29^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bd6dff55de7acb2e5065e69706400c41b1bd0521;p=linux.git

Merge branches 'acpi-watchdog', 'acpi-button' and 'acpi-video'

* acpi-watchdog:
  ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70

* acpi-button:
  ACPI / button: make module loadable when booted in non-ACPI mode

* acpi-video:
  ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
---

bd6dff55de7acb2e5065e69706400c41b1bd0521