summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2012-05-15 06:19:26 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2012-05-15 06:19:26 +0000
commita3593302779fa10ff87ee3a502d3ca0f4cdaec85 (patch)
tree637e76bcf5dc0eadb4fee59c457bdfc734cd57f9
parent66c9cb85889a755ef309b98f181b0bff148da875 (diff)
parent2f80d0eac1cb2bd09caefa3ba4be46fb06ffcb4a (diff)
downloadmanifest-a3593302779fa10ff87ee3a502d3ca0f4cdaec85.tar.gz
Merge "origen: updated the u-boot branch" into linaro_android_4.0.4
-rw-r--r--tracking-origen.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tracking-origen.xml b/tracking-origen.xml
index 07b9251e5..ef55f4904 100644
--- a/tracking-origen.xml
+++ b/tracking-origen.xml
@@ -33,7 +33,7 @@
<project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" />
<project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
<project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro_android_4.0.4" remote="linaro-android" />
- <project path="u-boot" name="people/angus/u-boot" revision="origen" remote="linaro-other"/>
+ <project path="u-boot" name="landing-teams/working/samsung/u-boot" revision="tracking" remote="linaro-other"/>
<project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
<project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
<project path="external/powertop" name="platform/external/powertop" revision="linaro"/>