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 | |
| parent | cc6a0e315a68e5db85bea347b0c5b0fe4a9a5904 (diff) | |
| parent | a0a37862a4e1844793d39aca9ccb8fecbdcb8659 (diff) | |
| parent | ac1e55b1fdb27c1b07a0a6fe519f1291ff1e7d40 (diff) | |
| parent | 53fa1f6e8a5958da698a31edf366ffe90596b490 (diff) | |
| download | linux-bd6dff55de7acb2e5065e69706400c41b1bd0521.tar.bz2 | |
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_