From 1b7da93072a48497e374d04827dd37424ed771d2 Mon Sep 17 00:00:00 2001
From: Amit Pundir <amit.pundir@linaro.org>
Date: Thu, 14 Feb 2013 16:42:25 +0530
Subject: manifests: use correct aosp tag and delete obsolete projects

---
 default.xml                   | 29 +++++++++++------------------
 landing-snowball.xml          | 16 ++++++----------
 linaro-default.xml            | 19 ++++++-------------
 staging-galaxynexus.xml       | 30 +++++++++++-------------------
 staging-origen.xml            | 19 ++++++-------------
 staging-panda.xml             | 19 ++++++-------------
 staging-vexpress-rtsm-isw.xml | 19 ++++++-------------
 staging-vexpress-rtsm.xml     | 19 ++++++-------------
 staging-vexpress-tc2-isw.xml  | 18 +++++-------------
 staging-vexpress.xml          | 19 ++++++-------------
 tracking-origen-quad.xml      | 19 +++----------------
 tracking-panda.xml            | 19 ++++++-------------
 tracking-snowball.xml         | 16 ++++++----------
 tracking-vexpress-rtsm-mp.xml | 19 ++++++-------------
 tracking-vexpress-tests.xml   | 21 +++++++--------------
 tracking.xml                  | 19 ++++++-------------
 16 files changed, 103 insertions(+), 217 deletions(-)

diff --git a/default.xml b/default.xml
index 00819ce..84b78d5 100644
--- a/default.xml
+++ b/default.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -67,14 +67,14 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Make sure we can find omapfb.h -->
   <!-- FIXME The 4.0.4 branch contains further changes that may need merging -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, various bugfixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase maximum number of partitions -->
@@ -126,23 +126,23 @@
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.2" />
   <project path="hardware/ril" name="platform/hardware/ril" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Need porting -->
-  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.2.2_r1.2" />
+  <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.2" />
-  <project path="cts" name="platform/cts" revision="refs/tags/android-4.2.2_r1.2" />
+  <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.2" />
-  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.2.2_r1.2" />
-  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.2.2_r1.2" />
+  <project path="system/media" name="platform/system/media" />
+  <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: need to be restored -->
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2.2_r1.2" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.2" />
@@ -159,7 +159,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
@@ -170,7 +169,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -201,6 +199,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -314,12 +313,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 0319e8b..7f71425 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -76,7 +76,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -100,13 +100,13 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -168,7 +168,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -179,7 +178,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -210,6 +208,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -320,9 +319,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/linaro-default.xml b/linaro-default.xml
index a9f085e..603b236 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -75,7 +75,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -99,11 +99,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -167,7 +167,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -178,7 +177,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -209,6 +207,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -319,12 +318,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index c446671..0158bb2 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -11,7 +11,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -63,14 +63,14 @@
   <project path="external/elfutils" name="platform/external/elfutils" revision="linaro_android_4.2.2" />
   <project path="external/quake" name="platform/external/quake" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" groups="device" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" groups="device" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Make sure we can find omapfb.h -->
   <!-- FIXME The 4.0.4 branch contains further changes that may need merging -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, various bugfixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase maximum number of partitions -->
@@ -119,13 +119,13 @@
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Need porting -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
-  <project path="external/tremolo" name="platform/external/tremolo" revision="refs/tags/android-4.2.2_r1.2" />
+  <project path="external/tremolo" name="platform/external/tremolo" />
   <!-- Linaro modifications: Add ECM -->
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.2.2" />
-  <project path="cts" name="platform/cts" revision="refs/tags/android-4.2.2_r1.2" />
+  <project path="cts" name="platform/cts" />
   <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" revision="linaro_android_4.2.2" />
-  <project path="system/media" name="platform/system/media" revision="refs/tags/android-4.2.2_r1.2" />
-  <project path="external/strace" name="platform/external/strace" revision="refs/tags/android-4.2.2_r1.2" />
+  <project path="system/media" name="platform/system/media" />
+  <project path="external/strace" name="platform/external/strace" />
   <!-- Linaro modifications: ISO C++11 support -->
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.2.2" />
   <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_4.2.2" />
@@ -133,13 +133,13 @@
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: need to be restored -->
-  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2.2_r1.2" />
+  <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" />
   <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" />
   <!-- Linaro modifications: Made it build with OpenJDK -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" groups="device" />
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" groups="device" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" groups="device" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" groups="device" />
   <!-- Linaro modification: Add workaround for aliasing violation -->
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" revision="linaro_android_4.2.2" />
   <project path="system/extras" name="platform/system/extras" revision="linaro_android_4.2.2" />
@@ -156,8 +156,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" groups="device" />
-  <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
@@ -168,7 +166,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" groups="device" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -199,6 +196,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -312,12 +310,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/staging-origen.xml b/staging-origen.xml
index a551f22..0dd3f60 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -75,7 +75,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -99,11 +99,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -167,7 +167,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -178,7 +177,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -209,6 +207,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -319,12 +318,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 2ca8a64..55d4e63 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -73,7 +73,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -97,11 +97,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -164,7 +164,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -175,7 +174,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -206,6 +204,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -316,12 +315,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index 5b23952..b7df213 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -12,7 +12,7 @@
            fetch="ssh://linaro-big-little-switcher-bot@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -83,7 +83,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -107,11 +107,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -175,7 +175,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -186,7 +185,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -217,6 +215,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -327,12 +326,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index e94b883..12175d1 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -82,7 +82,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -106,11 +106,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -174,7 +174,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -185,7 +184,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -216,6 +214,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -326,12 +325,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/staging-vexpress-tc2-isw.xml b/staging-vexpress-tc2-isw.xml
index efac1ac..f4177ce 100644
--- a/staging-vexpress-tc2-isw.xml
+++ b/staging-vexpress-tc2-isw.xml
@@ -12,7 +12,7 @@
            fetch="ssh://linaro-big-little-switcher-bot@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -80,7 +80,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -104,10 +104,10 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -171,7 +171,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -182,8 +181,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -214,6 +211,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -324,12 +322,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index a799fc7..200cc96 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -75,7 +75,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -99,11 +99,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -166,7 +166,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -177,7 +176,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -208,6 +206,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -318,12 +317,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/tracking-origen-quad.xml b/tracking-origen-quad.xml
index 2812f7a..dfe9c6f 100644
--- a/tracking-origen-quad.xml
+++ b/tracking-origen-quad.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -75,7 +75,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -98,12 +98,6 @@
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
-  <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
-  <!-- Linaro modifications: Find omapfb.h -->
-  <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -167,7 +161,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -178,7 +171,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -209,6 +201,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -319,12 +312,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 9ff5e4a..d2de6dd 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -72,7 +72,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -96,11 +96,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -163,7 +163,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -174,7 +173,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -205,6 +203,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -315,12 +314,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/tracking-snowball.xml b/tracking-snowball.xml
index a0337c5..08225b8 100644
--- a/tracking-snowball.xml
+++ b/tracking-snowball.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -75,7 +75,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -99,13 +99,13 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Fixed aliasing violations, ISO C++11 support -->
   <project path="external/skia" name="platform/external/skia" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -164,7 +164,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -175,7 +174,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -206,6 +204,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -316,9 +315,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/tracking-vexpress-rtsm-mp.xml b/tracking-vexpress-rtsm-mp.xml
index dbbfdac..81ffa45 100644
--- a/tracking-vexpress-rtsm-mp.xml
+++ b/tracking-vexpress-rtsm-mp.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -79,7 +79,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -103,11 +103,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -171,7 +171,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -182,7 +181,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -213,6 +211,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -323,12 +322,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/tracking-vexpress-tests.xml b/tracking-vexpress-tests.xml
index 72a9728..50378e0 100644
--- a/tracking-vexpress-tests.xml
+++ b/tracking-vexpress-tests.xml
@@ -5,14 +5,14 @@
            fetch="git://android.git.linaro.org/"
            review="review.android.git.linaro.org" />
   <remote  name="linaro-private"
-           fetch="ssh://linaro-big-little-switcher-bot@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/" />
+           fetch="ssh://amitpundir@linaro-private.git.linaro.org/srv/linaro-private.git.linaro.org/" />
   <remote  name="aosp-upstream"
            fetch="https://android-review.googlesource.com/" />
   <remote  name="linaro-other"
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -80,7 +80,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -104,11 +104,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" />
   <!-- Linaro modifications: New init.rc, assorted bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -171,7 +171,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
-  <project path="device/asus/grouper" name="device/asus/grouper" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
@@ -182,7 +181,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
   <project path="device/sample" name="device/sample" />
-  <project path="device/samsung/toro" name="device/samsung/toro" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" />
   <project path="external/aac" name="platform/external/aac" />
   <project path="external/android-clat" name="platform/external/android-clat" />
@@ -213,6 +211,7 @@
   <project path="external/easymock" name="platform/external/easymock" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" />
   <project path="external/esd" name="platform/external/esd" />
   <project path="external/expat" name="platform/external/expat" />
@@ -323,12 +322,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
   <project path="frameworks/testing" name="platform/frameworks/testing" />
   <project path="gdk" name="platform/gdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
   <project path="libnativehelper" name="platform/libnativehelper" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />
diff --git a/tracking.xml b/tracking.xml
index 8a45306..51f1230 100644
--- a/tracking.xml
+++ b/tracking.xml
@@ -10,7 +10,7 @@
            fetch="git://git.linaro.org/" />
   <remote  name="zyga"
            fetch="git://github.com/zyga/" />
-  <default revision="refs/tags/android-4.2.2_r1.2"
+  <default revision="refs/tags/android-4.2.2_r1"
            remote="aosp"
            sync-j="4" />
 
@@ -79,7 +79,7 @@
   <!-- Linaro modifications:  Add private lib for wifi to work with generic wext driver -->
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" revision="linaro_android_4.2.2" groups="common" />
   <!-- Linaro modifications: Integrate Linaro build system extras -->
-  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.2" groups="common" />
+  <project path="device/ti/panda" name="device/ti/panda" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Added property to turn off hardware GFX -->
   <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.2.2" groups="common" />
   <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros -->
@@ -103,11 +103,11 @@
   <!-- Linaro modifications: Make it build with OpenJDK" -->
   <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2.2" groups="common" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
-  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.2" groups="common" />
-  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.2" groups="common" />
+  <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.2.1" groups="common" />
+  <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: Find omapfb.h -->
   <!-- FIXME The 4.0.4 branch has further changes that may need porting -->
-  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.2" groups="common" />
+  <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.2.1" groups="common" />
   <!-- Linaro modifications: New init.rc, bug fixes -->
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.2.2" groups="common" />
   <!-- Linaro modifications: Increase the maximum number of disk partitions to 8 -->
@@ -170,7 +170,6 @@
   <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" groups="common" />
   <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" groups="common" />
   <project path="bootable/recovery" name="platform/bootable/recovery" groups="common" />
-  <project path="device/asus/grouper" name="device/asus/grouper" groups="common" />
   <project path="device/common" name="device/common" groups="common" />
   <project path="device/generic/armv7-a" name="device/generic/armv7-a" groups="common" />
   <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="common" />
@@ -181,7 +180,6 @@
   <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device,common" />
   <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device,common" />
   <project path="device/sample" name="device/sample" groups="common" />
-  <project path="device/samsung/toro" name="device/samsung/toro" groups="common" />
   <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="common" />
   <project path="external/aac" name="platform/external/aac" groups="common" />
   <project path="external/android-clat" name="platform/external/android-clat" groups="common" />
@@ -212,6 +210,7 @@
   <project path="external/easymock" name="platform/external/easymock" groups="common" />
   <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" groups="common" />
   <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" groups="common" />
+  <project path="external/eigen" name="platform/external/eigen" />
   <project path="external/emma" name="platform/external/emma" groups="common" />
   <project path="external/esd" name="platform/external/esd" groups="common" />
   <project path="external/expat" name="platform/external/expat" groups="common" />
@@ -322,12 +321,6 @@
   <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="common" />
   <project path="frameworks/testing" name="platform/frameworks/testing" groups="common" />
   <project path="gdk" name="platform/gdk" groups="common" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="common" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" groups="common" />
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" groups="common" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" groups="common" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" groups="common" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" groups="common" />
   <project path="libnativehelper" name="platform/libnativehelper" groups="common" />
   <project path="ndk" name="platform/ndk" groups="common" />
   <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="common" />
-- 
cgit v1.2.3