diff options
| author | Thierry Reding <treding@nvidia.com> | 2015-09-15 10:58:00 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2015-09-15 10:58:00 +0200 |
| commit | 54929d46dd25fc08a1da6a608c14b7be74d79ee8 (patch) | |
| tree | 9ce82d9565f1af5b4572e53f66154e1b202d740e | |
| parent | 3be4602442b88d42d9b4b61e87b43e035c279618 (diff) | |
| download | maint-scripts-54929d46dd25fc08a1da6a608c14b7be74d79ee8.tar.gz | |
Final branches for v4.3
Add an iommu branch for Tegra SMMU patches by Russell King and a pinctrl
branch to resolve a dependency between the pinctrl driver and the device
tree changes to make use of a properly defined gpio-range property.
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 1be2f37..3987f9f 100644 --- a/tegra-branches.sh.dot +++ b/tegra-branches.sh.dot @@ -1,10 +1,12 @@ merge_base=v4.2-rc1 branches="${branches} for-4.3/clk" # on v4.2-rc1 +branches="${branches} for-4.3/pinctrl" # on v4.2-rc1 branches="${branches} for-4.3/cleanup" # on v4.2-rc1 branches="${branches} for-4.3/soc" # on v4.2-rc1 branches="${branches} for-4.3/cpufreq" # on v4.2-rc1 +branches="${branches} for-4.3/iommu" # on v4.2-rc1 branches="${branches} for-4.3/memory" # on v4.2-rc1 -branches="${branches} for-4.3/dt" # on v4.2-rc1 +branches="${branches} for-4.3/dt" # on for-4.3/clk, for-4.3/dt branches="${branches} for-4.3/defconfig" # on v4.2-rc1 |