]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'for-next/kexec' into aarch64/for-next/core
authorWill Deacon <will.deacon@arm.com>
Mon, 10 Dec 2018 18:57:17 +0000 (18:57 +0000)
committerWill Deacon <will.deacon@arm.com>
Mon, 10 Dec 2018 18:57:17 +0000 (18:57 +0000)
Merge in kexec_file_load() support from Akashi Takahiro.

1  2 
arch/arm64/Kconfig
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/head.S
arch/arm64/kernel/image.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge