diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-02-15 12:02:42 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-02-15 12:02:42 +0100 |
commit | 31a3be353fc21f13e2ccdc661cda253f78b16661 (patch) | |
tree | bc139b454ee5ba0bff97acc58eb04f4c78c51ec8 /Documentation/filesystems/autofs4-mount-control.txt | |
parent | device property: Constify device_get_match_data() (diff) | |
parent | ACPI / EC: Restore polling during noirq suspend/resume phases (diff) | |
parent | ACPI: SPCR: Mark expected switch fall-through in acpi_parse_spcr (diff) | |
parent | ACPI: dock: document sysfs interface (diff) | |
download | linux-31a3be353fc21f13e2ccdc661cda253f78b16661.tar.xz linux-31a3be353fc21f13e2ccdc661cda253f78b16661.zip |
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