diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 01:37:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 01:37:17 +0100 |
| commit | 85595ada6c8f0c94d4d715db90c807d7baefb1c5 (patch) | |
| tree | 9f8edea42f6ee56f75e83b1319374ef6f758df0c /drivers/acpi | |
| parent | 60764eb379b371b8c7145f1a0914ee56d19e689f (diff) | |
| parent | e13452ac379070f038c264618e35559434252175 (diff) | |
| parent | c0041d40ba6a352e5a5304d656e8a26e2fba1f63 (diff) | |
| parent | 1c3b44c0f40d22b43fa58fe7081ca36e38449114 (diff) | |
| download | linux-85595ada6c8f0c94d4d715db90c807d7baefb1c5.tar.gz linux-85595ada6c8f0c94d4d715db90c807d7baefb1c5.tar.bz2 linux-85595ada6c8f0c94d4d715db90c807d7baefb1c5.zip | |
Merge branches 'acpi-pmic', 'acpi-apei' and 'acpi-x86'
* acpi-pmic:
ACPI / PMIC: Add TI PMIC TPS68470 operation region driver
* acpi-apei:
APEI / ERST: use 64-bit timestamps
ACPI / APEI: Remove arch_apei_flush_tlb_one()
arm64: mm: Remove arch_apei_flush_tlb_one()
ACPI / APEI: Remove ghes_ioremap_area
ACPI / APEI: Replace ioremap_page_range() with fixmap
ACPI / APEI: remove the unused dead-code for SEA/NMI notification type
ACPI / APEI: adjust a local variable type in ghes_ioremap_pfn_irq()
* acpi-x86:
ACPI / x86: Extend KIOX000A quirk to cover all affected BIOS versions