diff options
| author | Alistair Delva <adelva@google.com> | 2021-02-16 21:47:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 21:47:37 +0000 |
| commit | 8e4194a868eef2caa762900972bb907a95efc68a (patch) | |
| tree | 37a21c69306801ee7cdda5167a30896c8740155b /lib/xlat_mpu/aarch64/enable_mpu.S | |
| parent | c172a1c7d89d04fa25ff2dbe721be2630256427c (diff) | |
| parent | a85c81dcec809f33a69b20c877f4e28858566315 (diff) | |
| download | arm-trusted-firmware-8e4194a868eef2caa762900972bb907a95efc68a.tar.gz | |
Merge branch 'aosp/upstream-master' into HEAD am: faa476c0ca am: efb2826bb8 am: a85c81dcecandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-v2-preview-1
Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1589611
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00e6643bc16ae1034880dbacd2a1ab3bb1490e52
Diffstat (limited to 'lib/xlat_mpu/aarch64/enable_mpu.S')
0 files changed, 0 insertions, 0 deletions