git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
81867b7
c9c0279
)
Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next
author
Marc Zyngier
<maz@kernel.org>
Fri, 18 Sep 2020 15:22:18 +0000
(16:22 +0100)
committer
Marc Zyngier
<maz@kernel.org>
Fri, 18 Sep 2020 15:22:18 +0000
(16:22 +0100)
Signed-off-by: Marc Zyngier <maz@kernel.org>
# Conflicts:
# arch/arm64/kvm/mmu.c
Trivial merge
git.samba.org / sfrench / cifs-2.6.git / commitdiff