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

Browse source

* 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_

...

This commit is contained in:

Rafael J. Wysocki 2018-04-26 15:11:39 +02:00

parent cc6a0e315a a0a37862a4 ac1e55b1fd 53fa1f6e8a

commit bd6dff55de

3 changed files with 97 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

27

drivers/acpi/acpi_video.c

View file

59

drivers/acpi/acpi_watchdog.c

View file

24

drivers/acpi/button.c

View file