summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-09-24 17:58:53 -0700
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-09-24 17:58:53 -0700
commitf2be2c1ffb63fd22b572efbf6f9a3dbfdc30e11b (patch)
tree9c53990f3dca6afe1a27ccd3b152fa2562964b1e
parentab4fbb0df77f4ea91e6029e6aed965246168780a (diff)
llct: move to v4.3-rc2, drop the Gator topic
The user-side daemon for gator now has enough support through standard kernel APIs to provide the majority of it's functionality and ARM have suggested that the kernel module can be dropped from Linaro kernel. Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r--manifest3
1 files changed, 1 insertions, 2 deletions
diff --git a/manifest b/manifest
index 781a1c2..f6cae04 100644
--- a/manifest
+++ b/manifest
@@ -2,11 +2,10 @@
#
# topic <name> <remote/branch> [TIP|PIN|OUT] <commit> [merge|rebase <base>]
#
-topic mainline upstream/master PIN v4.2 merge
+topic mainline upstream/master PIN v4.3-rc2 merge
topic core-configs configs/config-core-tracking TIP - merge
topic basic-board-configs configs/config-boards-tracking TIP - merge
topic linaro-android-llct android_linaro/linaro-android-llct TIP - merge
-topic gator lt_arm/tracking-armlt-gator TIP - merge
#
# Packaging:
#topic linaro-builddeb-tweaks ynk/builddeb-tweaks-v3.19-rc3 TIP - merge