diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-11-22 22:37:08 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-11-22 22:37:08 +0530 |
| commit | 5e36b28f24fff0bbfe166db6c009e3becd3edf81 (patch) | |
| tree | f3f4d18b52db8e8ef4d1884776f70c9c7379996e | |
| parent | ae34423c34b21014bc0c49b0d44d8962236b2b58 (diff) | |
| parent | 660f4f5429777a1cf3c04c54a7ac4598d4eba06c (diff) | |
| download | manifest-5e36b28f24fff0bbfe166db6c009e3becd3edf81.tar.gz | |
Merge remote-tracking branch 'remotes/origin/linaro_android_5.0.0' into linaro_android_5.0.0_lsk-3.14
Conflicts:
linaro.xml
| -rw-r--r-- | linaro.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linaro.xml b/linaro.xml index 64fe12771..e71c76da1 100644 --- a/linaro.xml +++ b/linaro.xml @@ -15,9 +15,13 @@ <!-- Linaro Device Configs --> <project path="device/linaro/build" name="device/linaro/common" remote="linaro-android" revision="linaro-lollipop-experimental"/> <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/vexpress" name="kernel/linux-linaro-stable" revision="linux-linaro-lsk-v3.14-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" /> + <project path="vexpress-firmware" name="arm/vexpress-firmware" revision="juno-recovery-tarball" remote="linaro-other" groups="non-default,juno" /> </manifest> |