diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 03:02:16 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-18 03:02:16 +0100 |
| commit | a7f2766ac7c359216da4e714dc117c881e39a74a (patch) | |
| tree | 5be184c2a6cb57cc8293732f90b544bf7b9bf55e /include/acpi | |
| parent | 0c81e26e8641cd34af2f467e870dc96e85681f1e (diff) | |
| parent | dd1dbf94d2826a045fbbe2649d84b27d48620d56 (diff) | |
| parent | 9e811e19a7aca16d40e1ce0c68e9bbffea1b9810 (diff) | |
| parent | c68f0676ef7df08d52a65031db3e0ba017dbfd89 (diff) | |
| parent | 5928c281524fe451114e04f1dfa11246a37e859f (diff) | |
| download | linux-a7f2766ac7c359216da4e714dc117c881e39a74a.tar.gz linux-a7f2766ac7c359216da4e714dc117c881e39a74a.tar.bz2 linux-a7f2766ac7c359216da4e714dc117c881e39a74a.zip | |
Merge branches 'acpi-gpio', 'acpi-button', 'acpi-battery' and 'acpi-video'
* acpi-gpio:
gpio: merrifield: Add support of ACPI enabled platforms
ACPI: utils: Introduce acpi_dev_get_first_match_name()
* acpi-button:
ACPI: button: Add a LID switch blacklist and add 1 model to it
ACPI: button: Add a debug message when we're sending a LID event
* acpi-battery:
ACPI / battery: Add quirk for Asus GL502VSK and UX305LA
ACPI: battery: Drop redundant test for failure
* acpi-video:
ACPI / video: Default lcd_only to true on Win8-ready and newer machines