aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2015-01-06 12:02:07 +0100
committerThierry Reding <treding@nvidia.com>2015-01-06 14:21:03 +0100
commit11d620ba3e28cfdec0dccf01cb7781df0ab120e5 (patch)
tree94db99be6c50f59403df3d0eb0f066339d6538fc
parent42a6d4ff7d5ce47cfc719d4be14bc9821bc39506 (diff)
downloadmaint-scripts-11d620ba3e28cfdec0dccf01cb7781df0ab120e5.tar.gz
First branches for 3.20
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--tegra-branches.sh.dot8
1 files changed, 3 insertions, 5 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot
index 105e0b3..c8eb405 100644
--- a/tegra-branches.sh.dot
+++ b/tegra-branches.sh.dot
@@ -1,6 +1,4 @@
-merge_base=v3.18-rc1
+merge_base=v3.19-rc1
-branches="${branches} for-3.19/iommu" # on v3.18-rc1
-branches="${branches} for-3.19/dt" # on for-3.19/iommu
-branches="${branches} for-3.19/defconfig" # on v3.18-rc1
-branches="${branches} for-3.19/soc" # on v3.18-rc1
+branches="${branches} for-3.20/dt" # on v3.19-rc1
+branches="${branches} for-3.20/defconfig" # on v3.19-rc1