aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-06-16 14:35:34 -0600
committerStephen Warren <swarren@nvidia.com>2014-06-16 14:35:34 -0600
commitf0d2a24107667f57b209a6024157bfe374662f04 (patch)
tree29185c1fa776cc0561c7a47caa5447684f24f229
parent6352ad043e7e6cd57dbb6682a34ef1e7305c5628 (diff)
downloadmaint-scripts-f0d2a24107667f57b209a6024157bfe374662f04.tar.gz
First branches for 3.17
Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--tegra-branches.sh.dot12
1 files changed, 8 insertions, 4 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot
index b546d02..cf7ee8d 100644
--- a/tegra-branches.sh.dot
+++ b/tegra-branches.sh.dot
@@ -1,6 +1,10 @@
-merge_base=v3.15-rc1
+merge_base=v3.16-rc1
branches=""
-branches="${branches} for-3.16/soc" # On v3.15-rc1
-branches="${branches} for-3.16/dt" # On v3.15-rc1
-branches="${branches} for-3.16/defconfig" # On v3.15-rc1
+branches="${branches} for-3.17/pcie-regulators" # On v3.16-rc1
+branches="${branches} for-3.17/fuse-move" # On v3.16-rc1
+branches="${branches} for-3.17/delay-timer" # On v3.16-rc1
+branches="${branches} for-3.17/soc" # On for-3.17/fuse-move
+branches="${branches} for-3.17/dt-cros-ec-kbd" # On v3.16-rc1
+branches="${branches} for-3.17/dt" # On for-3.17/fuse-move, for-3.17/dt-cros-ec-kbd
+branches="${branches} for-3.17/defconfig" # On v3.16-rc1