diff options
| author | Thierry Reding <treding@nvidia.com> | 2016-04-21 12:20:59 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2016-04-21 12:20:59 +0200 |
| commit | 055cf2b16c45b8cd5f78f065da05da21271408ad (patch) | |
| tree | b6a2ec3e9c1dd6e200485c635d84a33ef3e5dc51 | |
| parent | 20dfff23da110dc1db507e386f7e80bffaab55b1 (diff) | |
| download | maint-scripts-055cf2b16c45b8cd5f78f065da05da21271408ad.tar.gz | |
Additional branches for v4.7
Add branches for the XUSB pad controller driver changes, the XHCI driver
addition as well as the 32-bit ARM device tree and default configuration
changes to enable these.
Signed-off-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | tegra-branches.sh.dot | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot index b5fc75d..25c07cc 100644 --- a/tegra-branches.sh.dot +++ b/tegra-branches.sh.dot @@ -1,5 +1,14 @@ merge_base=v4.6-rc1 +branches="${branches} for-4.7/clk" # on v4.6-rc1 + branches="${branches} for-4.7/soc" # on v4.6-rc1 branches="${branches} for-4.7/arm" # on v4.6-rc1 branches="${branches} for-4.7/arm64" # on v4.6-rc1 + +branches="${branches} for-4.7/phy" # on for-4.7/clk +branches="${branches} for-4.7/pci" # on for-4.7/phy +branches="${branches} for-4.7/xhci" # on for-4.7/phy +branches="${branches} for-4.7/xusb" # on for-4.7/xhci + +branches="${branches} for-4.7/genpd" # on for-4.7/soc |