-
由 Len Brown 提交于
Conflicts: drivers/acpi/apei/apei-base.c This was a conflict between 15afae60 (CPI, APEI: Fix incorrect APEI register bit width check and usage) and 653f4b53 (ACPICA: Expand OSL memory read/write interfaces to 64 bits) The former changed a parameter in the call to acpi_os_read_memory64() and the later replaced all calls to acpi_os_read_memory64() with calls to acpi_os_read_memory(). Signed-off-by: NLen Brown <len.brown@intel.com>
73f05330