diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-04 00:55:34 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-04 00:55:34 +0300 |
commit | 298bd7fb26cb2797a8b19b66a68389b3f27ae7e2 (patch) | |
tree | ac6e79aca87490d551c547021fe99da523ef9ea2 /drivers/s390/cio/vfio_ccw_cp.c | |
parent | 940c8df63a534e004a5828182712ecf0036c26f7 (diff) | |
parent | 7dae6326ed76431653793df0388b3a404de1217e (diff) | |
parent | e931d0dab4393f7195f84f42ed6fd973c26f62f1 (diff) | |
parent | 5e9323219410eaecd36937a4c9c5f8de45dab412 (diff) | |
download | linux-298bd7fb26cb2797a8b19b66a68389b3f27ae7e2.tar.xz |
Merge branches 'acpi-sysfs', 'acpi-apei' and 'acpi-blacklist'
* acpi-sysfs:
ACPI / sysfs: Extend ACPI sysfs to provide access to boot error region
* acpi-apei:
ACPI / APEI: Suppress message if HEST not present
ACPI, APEI, EINJ: Subtract any matching Register Region from Trigger resources
ACPI: APEI: fix the wrong iteration of generic error status block
ACPI: APEI: Enable APEI multiple GHES source to share a single external IRQ
* acpi-blacklist:
intel_pstate: convert to use acpi_match_platform_list()
ACPI / blacklist: add acpi_match_platform_list()