summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-03-04 11:17:28 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-03-04 11:17:28 +0100
commit8167e00e9e35ad90f62e2e424c80c9bc4f3adf7b (patch)
tree9e0a0435af5d88a46b227dc5f2686853fa747442 /drivers
parentdcaed592b2fc9ca7e8df2a2e6f4887dba4561415 (diff)
parentd693c008e3ca04db5916ff72e68ce661888a913b (diff)
parentff6cdfd71495e2b7995b6ec95480d15f89e3beef (diff)
Merge branches 'acpi-video' and 'acpi-x86'
* 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