summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Pfeffer <zach.pfeffer@linaro.org>2012-10-25 17:00:55 -0500
committerZach Pfeffer <zach.pfeffer@linaro.org>2012-10-25 17:03:06 -0500
commitdf71c8886c94892fff3ef2872ccabc83c57d35ce (patch)
treea4dfbe4f3e74bd8f0c4ecdfc726fb3f135b17b56
parente2f8523f822c22f3226b67cd181c8a15f42cf367 (diff)
tracking-vexpress-lw: Change kernel
kernel constructed via: git remote add arm git://linux-arm.org/linux-2.6-armdroid.git git fetch arm git remote add omar git://git.linaro.org/people/omarrmz/linux-aarch64.git git fetch omar switch to omar's tree at 7181edd0539e195f78adedbb6c3878f9f1e0c4bb (branch linaro-aarch64) git cherry-pick 590aef9684a4a365349382680ffe25c54fe7b8db git cherry-pick 9bcb29b8a14dff331e725e73707c6f2e448ff7c1 git cherry-pick 07088546dfd89368a2dd6e5c73ace005816f4d5b (submitted to omar) git cherry-pick 5d956e6184c98da7d121ba702be0f0311a2119ec (and this one) Signed-off-by: Zach Pfeffer <zach.pfeffer@linaro.org>
-rw-r--r--tracking-vexpress-lw.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tracking-vexpress-lw.xml b/tracking-vexpress-lw.xml
index 685b23f..ed2f826 100644
--- a/tracking-vexpress-lw.xml
+++ b/tracking-vexpress-lw.xml
@@ -57,7 +57,7 @@
<!-- Make sure only one of the kernels is enabled! -->
<!-- Linaro kernel -->
<!-- Upstream is: project path="kernel" name="people/andygreen/repo-branch-archive" revision="tilt-android-tracking" remote="linaro-other" / -->
- <project path="kernel" name="people/pfefferz/linux-aarch64" revision="linaro-aarch64+linux-2.6-armdroid" />
+ <project path="kernel" name="people/pfefferz/linux-aarch64" revision="linaro-aarch64+linux-3.6-armdroid" />
<!-- 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 -->