summaryrefslogtreecommitdiffstats
path: root/Documentation/virt
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2020-10-02 09:25:55 +0100
committerMarc Zyngier <maz@kernel.org>2020-10-02 09:25:55 +0100
commit4e5dc64c43192b4fd4c96ac150a8f013065f5f5b (patch)
tree5eeecb29b7da95c6397c56869b22d56d4255b488 /Documentation/virt
parent14ef9d04928b61d699fd0dd858b14b5d8150113e (diff)
parentffd1b63a5860968068e943eab33383a766d30f64 (diff)
parent030bdf3698b7c3af190dd1fe714f0545f23441d0 (diff)
Merge branches 'kvm-arm64/pt-new' and 'kvm-arm64/pmu-5.9' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>