Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core
authorWill Deacon <will.deacon@arm.com>
Mon, 26 Jun 2017 09:54:27 +0000 (10:54 +0100)
committerWill Deacon <will.deacon@arm.com>
Mon, 26 Jun 2017 09:54:27 +0000 (10:54 +0100)
commit3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb
tree81e5823a1c84a0131dc110f711f3c1416b4df985
parent9ad95c46c18ba828dfcf467024a45eb5b43ce769
parent77b246b32b2c4bc21e352dcb8b53a8aba81ee5a4
Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core

Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
arch/arm64/Kconfig
arch/arm64/include/asm/system_misc.h
arch/arm64/kernel/pci.c
arch/arm64/mm/fault.c