aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-08-25 11:27:08 -0600
committerStephen Warren <swarren@nvidia.com>2014-08-25 11:27:23 -0600
commita3d9e62ee7594906f65442be29be27bdbdcb315f (patch)
tree660327b0c9feb9fc4ab912ddd944bbf4c8009301
parent95834a79df8fde6141ebe734b530ded7aa21efd3 (diff)
downloadmaint-scripts-a3d9e62ee7594906f65442be29be27bdbdcb315f.tar.gz
First branches for 3.18
Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--tegra-branches.sh.dot5
1 files changed, 3 insertions, 2 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot
index db709d7..fc4eb6b 100644
--- a/tegra-branches.sh.dot
+++ b/tegra-branches.sh.dot
@@ -1,3 +1,4 @@
-merge_base=v3.16-rc6
+merge_base=v3.17-rc1
-branches=""
+branches="${branches} for-3.18/dt" # on v3.17-rc1
+branches="${branches} for-3.18/defconfig" # on v3.17-rc1