OSDN Git Service

Merge branch 'core/efi'
authorIngo Molnar <mingo@kernel.org>
Wed, 23 Sep 2015 10:32:56 +0000 (12:32 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 23 Sep 2015 10:32:56 +0000 (12:32 +0200)
commit88c86b05ef8c751e9be24ac9ad962e32e546062a
tree4f90e0c976f1e2c7f6dd84cb6e9fe2d3e4399318
parentbcee19f424a0d8c26ecf2607b73c690802658b29
parent8ece249a811e93d3f60e3f1ebdc86c7e7a95bdbf
Merge branch 'core/efi'
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