Merge branch 'for-next/mitigations' of git://git.kernel.org/pub/scm/linux/kernel...

author Will Deacon <will.deacon@arm.com>

Wed, 1 May 2019 14:34:56 +0000 (15:34 +0100)

committer Will Deacon <will.deacon@arm.com>

Wed, 1 May 2019 14:34:56 +0000 (15:34 +0100)
author Will Deacon <will.deacon@arm.com>
Wed, 1 May 2019 14:34:56 +0000 (15:34 +0100)
committer Will Deacon <will.deacon@arm.com>
Wed, 1 May 2019 14:34:56 +0000 (15:34 +0100)
diff --cc arch/arm64/Kconfig
Simple merge
diff --cc arch/arm64/include/asm/cpufeature.h
Simple merge
diff --cc arch/arm64/kernel/cpufeature.c
Simple merge
author	Will Deacon <will.deacon@arm.com>
	Wed, 1 May 2019 14:34:56 +0000 (15:34 +0100)
committer	Will Deacon <will.deacon@arm.com>
	Wed, 1 May 2019 14:34:56 +0000 (15:34 +0100)
		1	2
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/cpufeature.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	patch \|	diff1 \|	diff2 \|	blob \| history