summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-07-03 14:25:11 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-07-03 14:25:11 +0200
commitbee5799e4fc53e518255a9f65e4d81ff58ce6c9b (patch)
tree6730dd14ccd9227b8e3eb7b880ce32f1840039de /block
parent80abc82e6cf1959c3e88e85daede5795b755cf9c (diff)
parent72ebe5a0b3505019d4e7592c0dd9281e0b9e44c7 (diff)
parentb6aeab44ed387e5264d2969bc7deee993b29a515 (diff)
parent772bf1e2878ecfca0d1f332071c83e021dd9cf01 (diff)
Merge branches 'acpi-pmic', 'acpi-misc' and 'acpi-tables'
* acpi-pmic: ACPI / PMIC: xpower: Add support for the GPI1 regulator to the OpRegion handler * acpi-misc: ACPI: fix whitespace in pr_fmt() to align log entries * acpi-tables: ACPI: configfs: Unload SSDT on configfs entry removal