diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-04 11:17:28 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-03-04 11:17:28 +0100 |
| commit | 8167e00e9e35ad90f62e2e424c80c9bc4f3adf7b (patch) | |
| tree | 9e0a0435af5d88a46b227dc5f2686853fa747442 /.mailmap | |
| parent | dcaed592b2fc9ca7e8df2a2e6f4887dba4561415 (diff) | |
| parent | d693c008e3ca04db5916ff72e68ce661888a913b (diff) | |
| parent | ff6cdfd71495e2b7995b6ec95480d15f89e3beef (diff) | |
| download | linux-8167e00e9e35ad90f62e2e424c80c9bc4f3adf7b.tar.bz2 | |
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