Skip to content
Commit bc84a2d1 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'kvm/cortex-a76-erratum-1165522' into aarch64/for-next/core 

Pull in KVM workaround for A76 erratum #116522.

Conflicts:
	arch/arm64/include/asm/cpucaps.h
parents f357b3a7 a457b0f7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment