diff options
| author | Thierry Reding <treding@nvidia.com> | 2016-04-05 15:19:01 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2016-04-05 15:19:01 +0200 |
| commit | 1953cd2d1ddfc03bfd7b55b144bf0ae3265418f3 (patch) | |
| tree | 17e7657a1e573d64566838a195297410b2aeaaf4 | |
| parent | 6646c491b092fed2ec4b38c6bd272d987272bac5 (diff) | |
| download | maint-scripts-1953cd2d1ddfc03bfd7b55b144bf0ae3265418f3.tar.gz | |
Branches for v4.6
Add a branch for SoC specific code as well as 32-bit ARM and 64-bit ARM
device tree branches.
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | tegra-branches.sh.dot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot index 101f032..5ac84c4 100644 --- a/tegra-branches.sh.dot +++ b/tegra-branches.sh.dot @@ -1,8 +1,8 @@ -merge_base=v4.4-rc1 +merge_base=v4.5-rc1 -branches="${branches} for-4.5/clk" # on v4.4-rc1 -branches="${branches} for-4.5/memory" # on v4.4-rc1 +#branches="${branches} for-4.5/clk-fixes" # on v4.5-rc1 -branches="${branches} for-4.5/soc" # on v4.4-rc1 -branches="${branches} for-4.5/dt" # on for-4.5/clk, for-4.5/soc -branches="${branches} for-4.5/defconfig" # on v4.4-rc1 +branches="${branches} for-4.6/soc" # on v4.5-rc1 + +branches="${branches} for-4.6/arm" # on v4.5-rc1 +branches="${branches} for-4.6/arm64" # on v4.5-rc1 |