Merge branch 'kvm-arm64/ptp' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:41:22 +0000 (15:41 +0100)
committerMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:41:22 +0000 (15:41 +0100)
commitd8f37d291cd764ee966014ea2768709268d04abb
tree2b6098d67359e8ca053d56f43f7cc12cfa0638f1
parentbba8857febb1d0574480bd13a1be0567ac0f0ce9
parent127ce0b14133f48a5635faa9dac69a3a99f85146
Merge branch 'kvm-arm64/ptp' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
Documentation/virt/kvm/api.rst
arch/arm64/kvm/arm.c