diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-11-21 10:48:36 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-11-21 10:54:55 +0100 |
| commit | 0d8b3a14435c68f3540c8749eb59e0108dcac06b (patch) | |
| tree | dd5b1bddd7a167e9d0b7cf5303967a170392cd83 | |
| parent | 33d68823e867f07b0c9a84c34106fd6ad71202da (diff) | |
| download | maint-scripts-0d8b3a14435c68f3540c8749eb59e0108dcac06b.tar.gz | |
Add soc and iommu branches for 3.19
The iommu branch contains the rewrite of the memory controller and SMMU
drivers. To resolve a dependency, branch dt is now based on this new
branch.
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | tegra-branches.sh.dot | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot index 146dba7..105e0b3 100644 --- a/tegra-branches.sh.dot +++ b/tegra-branches.sh.dot @@ -1,4 +1,6 @@ merge_base=v3.18-rc1 -branches="${branches} for-3.19/dt" # on v3.18-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 |