summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-25 17:27:39 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-25 17:27:39 +0400
commitc8d72f1d768f03b6e1e3d2995d4dfadb4f21c067 (patch)
tree355aa80b641c127cb5e965576ae7893a4279cf51
parentc33cc3bc9d189dacf9a14685aeaf151b748a5c23 (diff)
lsk: add lsk-vexpress-iks topic
lsk-vexpress-iks is the lsk-vexpress topic with the iks topic merged into it and the missing commits from http://linaro-private.git.linaro.org/git/bL_switcher/linux.git, v3.9-master branch added on the top. Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r--manifest1
1 files changed, 1 insertions, 0 deletions
diff --git a/manifest b/manifest
index f1da84f..70b24f0 100644
--- a/manifest
+++ b/manifest
@@ -5,6 +5,7 @@
topic lsk-vexpress tixy/lsk-3.9-vexpress TIP - merge
topic big-LITTLE-MP-upstream b_L_mp/big-LITTLE-MP-master-v16 TIP - merge
topic iks nico/iks TIP - merge
+topic lsk-vexpress-iks ynk/lsk-3.9-vexpress-iks TIP - merge
# stable tree updates:
topic linux-3.x.y linux_stable/linux-3.9.y TIP - merge
# generic config fragments: