summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-06-04 10:43:52 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-06-04 10:43:52 +0200
commit2448d1399bac5b49c2664f96e223e42d2b88c022 (patch)
tree272b142149c07ef416428550ac4bf9100d0a976f /drivers/acpi
parent6c128e798f5b481c22cd3f7a8d5df16f1a77ea7e (diff)
parent3f4ba94e3615fe6f8a82e3a5f30677347d15130f (diff)
parent904aaf8050439510fb48cafb26a91034b0e7e615 (diff)
Merge branches 'acpi-soc' and 'acpi-tables'
* acpi-soc: ACPI: APD: Add AMD misc clock handler support clk: x86: Add ST oscout platform clock ACPI / LPSS: Only call pwm_add_table() for Bay Trail PWM if PMIC HRV is 2 * acpi-tables: ACPI / tables: improve comments regarding acpi_parse_entries_array()