Commit 19978922 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge fc8070a9 ("arm64: Add Neoverse-N2, Cortex-A710 CPU part definition")... 


Merge fc8070a9 ("arm64: Add Neoverse-N2, Cortex-A710 CPU part definition") into android-mainline

Steps on the way to 5.10.105

Resolves conflicts in:
	arch/arm64/include/asm/cputype.h

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic3c4e967837b69a70cbfd11ab6940fc63e670a28
parents f14cf582 fc8070a9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment