diff options
| author | Victor Chong <victor.chong@linaro.org> | 2019-11-20 18:01:00 +0000 |
|---|---|---|
| committer | Victor Chong <victor.chong@linaro.org> | 2019-11-20 18:01:39 +0000 |
| commit | 94cbcc328c82912a2ee251a48392ce97231310cb (patch) | |
| tree | f9559c3564d659c4ad07bf5fe9e83e5ece19f9b7 /swg-mods-common | |
| parent | 1342fdc08bf16b38e8854d08d6f24320b1b43e7a (diff) | |
| download | android-patchsets-94cbcc328c82912a2ee251a48392ce97231310cb.tar.gz | |
swg-mods-common: rebase optee_os patches on master
Change-Id: I6bcaf0521e23514d68b408745a11a6627f77f8db
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Diffstat (limited to 'swg-mods-common')
| -rwxr-xr-x | swg-mods-common | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swg-mods-common b/swg-mods-common index 7e6dd54..29ad64d 100755 --- a/swg-mods-common +++ b/swg-mods-common @@ -163,7 +163,7 @@ fi cd optee/optee_os #git fetch https://github.com/vchong/optee_os pull/1/head && git merge --no-edit FETCH_HEAD # cherry pick instead of merge so that patches stay on top -git fetch https://github.com/vchong/optee_os kmgk_pta_rebase2 && git cherry-pick c8ec3d05eeaf92a0605f1410075c51ec59f7319c^..24038f71a6778a7b148ea017807eb696f6908af5 +git fetch https://github.com/vchong/optee_os kmgk_pta_rebase2 && git cherry-pick 7bdc19b1afc1882010ee5a3d6f0f740aa1ad2b15^..b24929c6c85d0626be0f7dbabce00b4a9c676be1 cd - # temp kmgk patches to test refactoring |