| commit | cd28898b8f5255de0e88067579f4ee4022a96dbb | [log] [tgz] |
|---|---|---|
| author | Marc Zyngier <maz@kernel.org> | Sat Oct 26 10:55:24 2019 +0100 |
| committer | Marc Zyngier <maz@kernel.org> | Sat Oct 26 10:55:24 2019 +0100 |
| tree | 727be15780e531a604136ac010e732f90e8f512b | |
| parent | c2cc62d831863151fd0cb7da7ac9a0c324aab871 [diff] | |
| parent | ff3fd98661d002474e6716f3c9a37f85117d92b2 [diff] |
Merge remote-tracking branch 'arm64/for-next/core' into kvm-arm64/erratum-1319367 Conflicts: arch/arm64/include/asm/cpucaps.h arch/arm64/kernel/cpu_errata.c