diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-04-26 15:11:39 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-04-26 15:11:39 +0200 |
commit | bd6dff55de7acb2e5065e69706400c41b1bd0521 (patch) | |
tree | de6e890f0ac185bd9caf612758b0cff5472dd47b /drivers/acpi | |
parent | ACPI / scan: Initialize watchdog before PNP (diff) | |
parent | ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 (diff) | |
parent | ACPI / button: make module loadable when booted in non-ACPI mode (diff) | |
parent | ACPI / video: Only default only_lcd to true on Win8-ready _desktops_ (diff) | |
download | linux-bd6dff55de7acb2e5065e69706400c41b1bd0521.tar.xz linux-bd6dff55de7acb2e5065e69706400c41b1bd0521.zip |
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_