Merge branches 'acpi-ec', 'acpi-tables' and 'acpi-doc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 Feb 2018 11:02:42 +0000 (12:02 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 Feb 2018 11:02:42 +0000 (12:02 +0100)
commit31a3be353fc21f13e2ccdc661cda253f78b16661
treebc139b454ee5ba0bff97acc58eb04f4c78c51ec8
parent67dcc26d208ca5578f08c3c78cb254418c24e9ec
parent3cd091a773936c54344a519f7ee1379ccb620bee
parent5a9e59e8d9dd9586d78c244b9d96fb18156daad3
parent22029845ad81033115910cdef35170de6a10a1eb
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