| commit | bc84a2d106beab6000223b569c3bcb9ebf49d9ec | [log] [tgz] |
|---|---|---|
| author | Will Deacon <will.deacon@arm.com> | Mon Dec 10 18:53:03 2018 +0000 |
| committer | Will Deacon <will.deacon@arm.com> | Mon Dec 10 18:53:52 2018 +0000 |
| tree | 41d5fee0c983a8820478c0c7e812b76be43ed07c | |
| parent | f357b3a7e17af7736d67d8267edc1ed3d1dd9391 [diff] | |
| parent | a457b0f7f50d4d189f0d009617885e4341133e8e [diff] |
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