From eebc8b58455aa1be21a980cc0d73a0545279e5b4 Mon Sep 17 00:00:00 2001
From: Axel Fagerstedt <axel.fagerstedt@linaro.org>
Date: Fri, 18 Jan 2013 11:09:46 +0100
Subject: rebase

---
 tracking.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tracking.xml b/tracking.xml
index b53897a..b43609f 100644
--- a/tracking.xml
+++ b/tracking.xml
@@ -20,6 +20,8 @@
   <project path="external/lava-blackbox" name="lava-blackbox" remote="zyga" revision="master" groups="common" />
 
   <!-- Linaro extras -->
+  <project path="external/thirdparty-benchmarks" name="platform/external/thirdparty-benchmarks" revision="master" groups="common" />
+  <project path="external/linaro-android-tools" name="platform/external/linaro-android-tools" revision="master" groups="common" />
   <project path="packages/apps/DisableSuspend" name="platform/packages/apps/DisableSuspend" revision="master" groups="common" />
   <project path="hardware/samsung/origen/gralloc_ump" name="platform/hardware/samsung/origen/gralloc_ump" revision="linaro_android_jb" groups="common" />
   <project path="hardware/samsung/origen/ump" name="platform/hardware/samsung/origen/ump" revision="linaro_android_jb" groups="common" />
@@ -30,7 +32,7 @@
   <project path="device/linaro/snowball" name="device/linaro/snowball" revision="linaro-jb" groups="common" />
   <project path="device/linaro/origen" name="device/linaro/origen" revision="linaro-jb" groups="common" />
   <project path="hardware/linaro/tinyhal" name="platform/hardware/linaro/tinyhal" revision="linaro-jellybean" groups="common" />
-  <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.19" groups="common" />
+  <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.20" groups="common" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" groups="common" />
   <project path="external/x264" name="platform/external/x264" revision="linaro-master" groups="common" />
   <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-1.0.1" groups="common" />
@@ -52,9 +54,10 @@
   <project path="external/stress" name="platform/external/stress" revision="linaro_android" groups="common" />
   <project path="external/stressapptest" name="platform/external/stressapptest" revision="linaro_android" groups="common" />
   <project path="external/htop" name="platform/external/htop" revision="linaro_android" groups="common" />
+  <project path="external/cyclictest" name="platform/external/cyclictest" revision="linaro_android" groups="vexpress"/>
+  <project path="external/sysbench" name="platform/external/sysbench" revision="linaro_android" groups="vexpress"/>
   <project path="external/stringbench" name="platform/external/stringbench" revision="master" groups="common" />
-  <!-- Make sure only one of the kernels is enabled! -->
-  <!-- Linaro kernel -->
+  <!-- Linaro kernels -->
   <project path="kernel/linaro/origen" name="people/bhoj/samsung/kernel" remote="linaro-other" revision="android-tracking" groups="origen" />
   <project path="kernel/linaro/vexpress" name="kernel/linux-linaro-tracking" remote="linaro-other" revision="linux-linaro" groups="vexpress" />
   <!-- AOSP kernel -->
@@ -187,8 +190,6 @@
   <project path="external/antlr" name="platform/external/antlr" groups="common" />
   <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="common" />
   <project path="external/apache-http" name="platform/external/apache-http" groups="common" />
-  <project path="external/cyclictest" name="platform/external/cyclictest" revision="linaro_android" groups="vexpress"/>
-  <project path="external/sysbench" name="platform/external/sysbench" revision="linaro_android" groups="vexpress"/>
   <project path="external/apache-qp" name="platform/external/apache-qp" groups="common" />
   <project path="external/apache-xml" name="platform/external/apache-xml" groups="common" />
   <project path="external/arduino" name="platform/external/arduino" groups="common" />
-- 
cgit v1.2.3