Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix
authorIngo Molnar <mingo@kernel.org>
Wed, 14 Oct 2015 14:05:18 +0000 (16:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 14 Oct 2015 14:05:18 +0000 (16:05 +0200)
commitc7d77a7980e434c3af17de19e3348157f9b9ccce
treeb32c5988ce8239b80c83e94c22d68f5eb0fb84da
parent0ce423b6492a02be11662bfaa837dd16945aad3e
parent8a53554e12e98d1759205afd7b8e9e2ea0936f48
Merge branch 'x86/urgent' into core/efi, to pick up a pending EFI fix

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/arm64/include/asm/acpi.h
arch/arm64/include/asm/memory.h
arch/arm64/include/asm/pgtable.h
arch/arm64/mm/proc.S
arch/x86/boot/header.S
arch/x86/platform/efi/efi.c
drivers/acpi/apei/ghes.c