diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:17:53 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:17:53 +0200 |
| commit | 9636603da3c3367139b46e19a38fb2e4850e7420 (patch) | |
| tree | d705e6742783b33a2b290bc1f5f4c8f6a0274c86 /drivers | |
| parent | 322618684353315e14f586b33d8a016286ffa700 (diff) | |
| parent | 9c40f956ce9b331493347d1b3cb7e384f7dc0581 (diff) | |
| parent | 1dc482b6578e2869e51c35276017178503d5ac81 (diff) | |
| parent | 906dc284d00c8aa8e2ad3f71182cf9fa3107e35a (diff) | |
| download | linux-9636603da3c3367139b46e19a38fb2e4850e7420.tar.bz2 | |
Merge branches 'acpi-ec', 'acpi-irq' and 'acpi-quirks'
* acpi-ec:
Revert "ACPI / EC: Enable event freeze mode..." to fix a regression
ACPI / EC: Drop EC noirq hooks to fix a regression
* acpi-irq:
ACPI / irq: Fix return code of acpi_gsi_to_irq()
* acpi-quirks:
ACPI / x86: Add KIOX000A accelerometer on GPD win to always_present_ids array
ACPI / x86: Add Dell Venue 11 Pro 7130 touchscreen to always_present_ids
ACPI / x86: Allow matching always_present_id array entries by DMI