summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Pfeffer <zach.pfeffer@linaro.org>2012-10-19 09:33:38 -0500
committerZach Pfeffer <zach.pfeffer@linaro.org>2012-10-19 09:33:38 -0500
commitfa6eb5937db2d65c1ea17d834457dbddf7e846a6 (patch)
treeabda0a2585b9f5819fe65406b79896f775c55341
parent83af005aa39dfe7edace1815d7190ad1646b89b2 (diff)
downloadmanifests_sandbox-fa6eb5937db2d65c1ea17d834457dbddf7e846a6.tar.gz
tracking-vexpress-lw: Change kernel
kernel constructed via: Omar's tree as a base: git://git.linaro.org/people/omarrmz/linux-aarch64.git linaro-aarch64 then cherry-picked: 590aef9684a4a365349382680ffe25c54fe7b8db Fixed merge conflicts in favor of the cherry-picked patch. Then cherry-picked: 39d906827b397135970574c2ec07aa727ddba7b9 No merge conflicts. Did a build, saw the missing declarations. Reverted: ad47bd7252bf402fe7dba92f5240b5ed16832ae7 b8318b01a8f7f760ae3ecae052ccc7fc123d9508 Added 6916fd086f0c5d7871ad3986300ba30d63616925 and built. The result of the tree is at: git://android.git.linaro.org/people/pfefferz/linux-aarch64 linaro-aarch64+linux-2.6-armdroid 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 01d0f9a..685b23f 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-armv8+android-experimental" />
+ <project path="kernel" name="people/pfefferz/linux-aarch64" revision="linaro-aarch64+linux-2.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 -->