Merge branch 'for-next/mitigations' of git://git.kernel.org/pub/scm/linux/kernel...
authorWill Deacon <will.deacon@arm.com>
Wed, 1 May 2019 14:34:56 +0000 (15:34 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 1 May 2019 14:34:56 +0000 (15:34 +0100)
commit50abbe19623e08e2aa34e0e526bd6115569f3dc3
treeecaddb898d671847f70c40fcab5fd115dacc1a1e
parent9431ac2bf6b742d87cdac051adc1976308070110
parent4ad499c94264a2ee05aacc518b9bde658318e510
Merge branch 'for-next/mitigations' of git://git./linux/kernel/git/arm64/linux into for-next/core
arch/arm64/Kconfig
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/cpufeature.c