diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-03-19 16:52:19 +0000 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-03-19 16:52:19 +0000 |
| commit | 702391b27594f4cfce6bcf4f9d88fea4aef08645 (patch) | |
| tree | 694c3aef75c0d3b342a33eb9217e6c93d98b9395 | |
| parent | 7608eed47624ac53ba873b11cccb7f0785810c44 (diff) | |
| parent | ca005b3f37969064273f10e5945916cc2773cfa1 (diff) | |
| download | manifest-702391b27594f4cfce6bcf4f9d88fea4aef08645.tar.gz | |
Merge branch 'linaro_android_5.0.0' into linaro_android_5.0.0_toolchains
| -rw-r--r-- | linaro.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linaro.xml b/linaro.xml index 8a4758b79..da26c7b5f 100644 --- a/linaro.xml +++ b/linaro.xml @@ -18,6 +18,7 @@ <project path="external/linaro-android-userspace-test" name="platform/external/linaro-android-userspace-test" revision="master" remote="linaro-android"/> <project path="external/libc-bench" name="platform/external/libc-bench" revision="master" remote="linaro-android"/> <project path="external/stringbench" name="platform/external/stringbench" revision="master" remote="linaro-android"/> + <project path="android-patchsets" name="android-patchsets" revision="master" remote="linaro-android"/> <!-- Linaro Device Configs --> <project path="device/linaro/juno" name="android/device/linaro/juno" revision="linaro-lollipop" remote="linaro-android" groups="non-default,juno" /> @@ -26,7 +27,7 @@ <project path="device/linaro/vexpress" name="device/linaro/vexpress" revision="linaro-lollipop" remote="linaro-android" groups="non-default,vexpress" /> <project path="device/linaro/fvp" name="device/linaro/fvp-armv8" revision="linaro-fvp-lollipop" remote="linaro-android" groups="non-default,fvp-armv8,vexpress" /> <!-- Linaro Kernels --> - <project path="kernel/linaro/armv8" name="kernel/juno" revision="linaro-armv8" remote="linaro-android" groups="non-default,juno,juno32,fvp-armv8" /> + <project path="kernel/linaro/armv8" name="landing-teams/working/arm/kernel-release" revision="lsk-3.10-armlt-juno" remote="linaro-other" groups="non-default,juno,juno32,fvp-armv8" /> <project path="kernel/linaro/vexpress" name="kernel/linux-linaro-stable" revision="linux-linaro-lsk-android" remote="linaro-other" groups="non-default,vexpress" /> <!-- Linaro Bootloaders --> <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" groups="non-default,vexpress" /> |