Merge branches 'acpi-video' and 'acpi-x86'

Browse source

* acpi-video:
  ACPI / video: Extend chassis-type detection with a "Lunch Box" check
  ACPI / video: Refactor and fix dmi_is_desktop()

* acpi-x86:
  ACPI / x86: Make PWM2 device always present at Lenovo Yoga Book

...

This commit is contained in:

Rafael J. Wysocki 2019-03-04 11:17:28 +01:00

parent dcaed592b2 d693c008e3 ff6cdfd714

commit 8167e00e9e

2 changed files with 19 additions and 6 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

20

drivers/acpi/acpi_video.c

View file

5

drivers/acpi/x86/utils.c

View file