summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2013-05-25 07:57:05 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2013-05-25 07:57:05 +0800
commit9de0281fe8d93e86afa57e4ebd6ad6821cd0eebc (patch)
tree158b004d50e32615613cbc8d2b2757a540b9cdce
parent6afaa6a1fe1eabc8bdcdb3275ae17751e93ddf48 (diff)
parentc8ba134b475ab754bf3024e9e328098474009f66 (diff)
Merge branch 'linaro_android_4.2.2' of git://android.git.linaro.org/platform/manifest into linaro_android_4.2.2
-rw-r--r--default.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/default.xml b/default.xml
index 66816aa..f98b7e0 100644
--- a/default.xml
+++ b/default.xml
@@ -103,7 +103,8 @@
<project path="kernel/linaro/hisilicon" name="linux-iks.git" revision="integration-linux-hs" remote="linaro-landing-team-hisilicon" groups="hisilicon" />
<!-- AOSP kernels -->
<project path="kernel/samsung/maguro" name="kernel/omap" revision="android-omap-tuna-3.0-jb-mr1.1" groups="galaxynexus" />
- <project path="kernel/samsung/manta" name="kernel/exynos" revision="android-exynos-manta-3.4-jb-mr1.1" remote="aosp-upstream" groups="nexus10" />
+ <!-- FIXME currently missing in our AOSP mirror: project path="kernel/samsung/manta" name="kernel/exynos" revision="android-exynos-manta-3.4-jb-mr1.1" remote="aosp-upstream" groups="nexus10" / -->
+ <project path="kernel/samsung/manta" name="people/bernhardrosenkranzer/kernel-nexus10" revision="linaro_android_4.2.2" remote="linaro-other" groups="nexus10" />
<project path="kernel/asus/grouper" name="kernel/tegra" revision="22b4fcde206e96f57bf0a111403fc3d75532918a" remote="aosp-upstream" groups="nexus7" />
<!-- Linaro changes: Make it build with gcc 4.8, based on linaro-android-msm-mako-3.4-jb-mr1-kgsl" -->
<project path="kernel/lge/mako" name="kernel/msm" revision="linaro_android_4.2.2" groups="nexus4" />