diff options
| author | Rafael J. Wysocki | 2018-02-15 12:02:42 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2018-02-15 12:02:42 +0100 |
| commit | 31a3be353fc21f13e2ccdc661cda253f78b16661 (patch) | |
| tree | bc139b454ee5ba0bff97acc58eb04f4c78c51ec8 /drivers/base | |
| parent | 67dcc26d208ca5578f08c3c78cb254418c24e9ec (diff) | |
| parent | 3cd091a773936c54344a519f7ee1379ccb620bee (diff) | |
| parent | 5a9e59e8d9dd9586d78c244b9d96fb18156daad3 (diff) | |
| parent | 22029845ad81033115910cdef35170de6a10a1eb (diff) | |
Merge branches 'acpi-ec', 'acpi-tables' and 'acpi-doc'
* acpi-ec:
ACPI / EC: Restore polling during noirq suspend/resume phases
* acpi-tables:
ACPI: SPCR: Mark expected switch fall-through in acpi_parse_spcr
* acpi-doc:
ACPI: dock: document sysfs interface
ACPI / DPTF: Document dptf_power sysfs atttributes