Merge branches 'acpi-watchdog', 'acpi-button' and 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Apr 2018 13:11:39 +0000 (15:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Apr 2018 13:11:39 +0000 (15:11 +0200)
commitbd6dff55de7acb2e5065e69706400c41b1bd0521
treede6e890f0ac185bd9caf612758b0cff5472dd47b
parentcc6a0e315a68e5db85bea347b0c5b0fe4a9a5904
parenta0a37862a4e1844793d39aca9ccb8fecbdcb8659
parentac1e55b1fdb27c1b07a0a6fe519f1291ff1e7d40
parent53fa1f6e8a5958da698a31edf366ffe90596b490
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_