summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Fagerstedt <axel.fagerstedt@linaro.org>2013-01-22 09:45:23 +0100
committerAxel Fagerstedt <axel.fagerstedt@linaro.org>2013-01-22 09:45:23 +0100
commit90f2f27033e83bbfe2a4d9c1f6d77ec6643a9a5a (patch)
tree5a0e59c2ea6911b7df4b9954a300f080f746c066
parenteebc8b58455aa1be21a980cc0d73a0545279e5b4 (diff)
parentaa80560183dbff2a8ec823e9f919837ce05eab9c (diff)
downloadmanifests_sandbox-90f2f27033e83bbfe2a4d9c1f6d77ec6643a9a5a.tar.gz
Merge remote-tracking branch 'origin/linaro_android_4.2.1' into foo
-rw-r--r--staging-vexpress-tc2-isw.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/staging-vexpress-tc2-isw.xml b/staging-vexpress-tc2-isw.xml
index 27218ea..5473da9 100644
--- a/staging-vexpress-tc2-isw.xml
+++ b/staging-vexpress-tc2-isw.xml
@@ -59,7 +59,7 @@
<project path="external/stringbench" name="platform/external/stringbench" revision="master" />
<!-- Make sure only one of the kernels is enabled! -->
<!-- Linaro kernel -->
- <project path="kernel" name="bL_switcher/linux" revision="master" remote="linaro-private" />
+ <project path="kernel" name="bL_switcher/linux" revision="next" remote="linaro-private" />
<!-- AOSP kernel -->
<!-- project path="kernel" name="kernel/omap" revision="android-omap-panda-3.0" -->
<!-- We copy the defconfig over so we can use the same name as w/ the Linaro kernel -->