]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e629003 2d726d0)
Merge remote-tracking branch 'arm64/for-next/vhe-only' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:42:40 +0000 (15:42 +0100)
committerMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:42:40 +0000 (15:42 +0100)
Signed-off-by: Marc Zyngier <maz@kernel.org>
1  2 
arch/arm64/kernel/cpufeature.c patch | diff1 | diff2 | blob | history
arch/arm64/kernel/hyp-stub.S patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge
diff --cc arch/arm64/kernel/hyp-stub.S
Simple merge
Unnamed repository; edit this file 'description' to name the repository.