git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 17f8452 0cc519f)

author	Marc Zyngier <maz@kernel.org>
	Wed, 9 Dec 2020 10:00:24 +0000 (10:00 +0000)
committer	Marc Zyngier <maz@kernel.org>
	Wed, 9 Dec 2020 10:00:24 +0000 (10:00 +0000)
commit	3a514592b698588326924625b6948a10c35fadd5
tree	1209f5cb0a780f87c41e3299b22776a221766892	tree \| snapshot
parent	17f84520cb8fcaf475c96c3ee90dd97b55a63669	commit \| diff
parent	0cc519f85a527e1c5ad5a7f182105fe614e9ff80	commit \| diff

Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>

13 files changed:

arch/arm64/include/asm/cpucaps.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/cpufeature.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/kvm_asm.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/kvm_host.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/kvm_mmu.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/sysreg.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/proton-pack.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/arm.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/hyp/nvhe/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/hyp/nvhe/switch.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/va_layout.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository