diff options
Diffstat (limited to 'swg-mods-common')
| -rwxr-xr-x | swg-mods-common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swg-mods-common b/swg-mods-common index e431dcb..7e6dd54 100755 --- a/swg-mods-common +++ b/swg-mods-common @@ -163,12 +163,12 @@ 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^..f089948f4119df6e50c091114554dc031a6c6184 +git fetch https://github.com/vchong/optee_os kmgk_pta_rebase2 && git cherry-pick c8ec3d05eeaf92a0605f1410075c51ec59f7319c^..24038f71a6778a7b148ea017807eb696f6908af5 cd - # temp kmgk patches to test refactoring cd device/linaro/kmgk -git fetch https://github.com/vchong/kmgk refactoring2 && git cherry-pick aea1bb393b48f138484897caf487810f946505da^..8664e8cb9812efca051595170f57e89883072dd4 +git fetch https://github.com/vchong/kmgk refactoring2 && git cherry-pick 5faa8b92afa9c3e581a2c4864427021449474b89^..bd24879d728b3accc6ed0f8e0832ef50eb4ae4c2 cd - ####################################################### |