diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:43:52 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-04 10:43:52 +0200 |
| commit | 2448d1399bac5b49c2664f96e223e42d2b88c022 (patch) | |
| tree | 272b142149c07ef416428550ac4bf9100d0a976f /block/blk-mq-sysfs.c | |
| parent | 6c128e798f5b481c22cd3f7a8d5df16f1a77ea7e (diff) | |
| parent | 3f4ba94e3615fe6f8a82e3a5f30677347d15130f (diff) | |
| parent | 904aaf8050439510fb48cafb26a91034b0e7e615 (diff) | |
| download | talos-obmc-linux-2448d1399bac5b49c2664f96e223e42d2b88c022.tar.gz talos-obmc-linux-2448d1399bac5b49c2664f96e223e42d2b88c022.zip | |
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()
