diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:04:14 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-12-21 10:04:14 +0100 |
commit | 4cd9da8ad1c98a2c9c2b30cbd5c40faba0047bae (patch) | |
tree | 695b3af892aa6778c859e7c50ad52aea6903b627 /include | |
parent | 1027fb0fb94aaaaa36ad58193fc61c36efaced85 (diff) | |
parent | 1f000e1bfff42e960e5d4562213a95016acc712f (diff) | |
parent | 1a2fa02f7489dc4d746f2a15fb77b3ce1affade8 (diff) | |
parent | 98cff8b23ed1c763a029ee81ea300df0d153d07d (diff) | |
parent | f8c6d1402b89f22a3647705d63cbd171aa19a77e (diff) | |
download | linux-4cd9da8ad1c98a2c9c2b30cbd5c40faba0047bae.tar.bz2 |
Merge branches 'acpi-tables', 'acpi-soc', 'acpi-apei' and 'acpi-misc'
* acpi-tables:
ACPI / tables: Add an ifdef around amlcode and dsdt_amlcode
ACPI / tables: add DSDT AmlCode new declaration name support
ACPI: SPCR: Consider baud rate 0 as preconfigured state
* acpi-soc:
ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
ACPI / APD: Add clock frequency for Hisilicon Hip08 SPI controller
* acpi-apei:
ACPI/APEI: Clear GHES block_status before panic()
ACPI, APEI, EINJ: Change to use DEFINE_SHOW_ATTRIBUTE macro
* acpi-misc:
ACPI: fix acpi_find_child_device() invocation in acpi_preset_companion()