diff options
| author | Rafael J. Wysocki <[email protected]> | 2018-06-04 08:43:52 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2018-06-04 08:43:52 +0000 |
| commit | 2448d1399bac5b49c2664f96e223e42d2b88c022 (patch) | |
| tree | 272b142149c07ef416428550ac4bf9100d0a976f /drivers/fpga/machxo2-spi.c | |
| parent | Merge branches 'acpi-cppc', 'acpi-misc', 'acpi-battery' and 'acpi-ac' (diff) | |
| parent | ACPI: APD: Add AMD misc clock handler support (diff) | |
| parent | ACPI / tables: improve comments regarding acpi_parse_entries_array() (diff) | |
| download | kernel-2448d1399bac5b49c2664f96e223e42d2b88c022.tar.gz kernel-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()