diff options
| author | Stephen Warren <swarren@nvidia.com> | 2014-02-05 10:20:33 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2014-02-05 10:20:33 -0700 |
| commit | 816308608cfe295e92f45e19a6bb0452be0e6715 (patch) | |
| tree | 4e1d0482f289467f18120610f43014e0e67e9291 | |
| parent | 67b60f881648ce8a9a31fe575489bd1689cd321d (diff) | |
| download | maint-scripts-816308608cfe295e92f45e19a6bb0452be0e6715.tar.gz | |
Update for 3.15
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rwxr-xr-x | merge-linux-tegra.sh | 2 | ||||
| -rw-r--r-- | tegra-branches.sh.dot | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/merge-linux-tegra.sh b/merge-linux-tegra.sh index d19ea36..227c2cc 100755 --- a/merge-linux-tegra.sh +++ b/merge-linux-tegra.sh @@ -7,7 +7,7 @@ set -x if [ "$1" != "--no-reset" ]; then git checkout for-next - git reset --hard v3.13-rc3 + git reset --hard v3.14-rc1 fi for b in ${branches}; do diff --git a/tegra-branches.sh.dot b/tegra-branches.sh.dot index 1c185e6..ad3d61a 100644 --- a/tegra-branches.sh.dot +++ b/tegra-branches.sh.dot @@ -1,11 +1,4 @@ branches="" -branches="${branches} for-3.14/deps-from-dma-defer_probe" # On v3.13-rc1 -branches="${branches} for-3.14/deps-from-asoc-dma" # (asoc-dma-v3.14) On v3.13-rc1, includes deps-from-dma-defer_probe -branches="${branches} for-3.14/deps-from-dma-of" # On v3.13-rc1 -branches="${branches} for-3.14/deps-from-clk-tegra" # (clk-tegra-for-3.14) On v3.13-rc1 -branches="${branches} for-3.14/trusted-foundations" # On v3.13-rc1 -branches="${branches} for-3.14/dmas-resets-rework" # On v3.13-rc3, includes deps-from-* -branches="${branches} for-3.14/powergate" # On for-3.14/dmas-resets-rework -branches="${branches} for-3.14/soc" # On v3.13-rc1 -branches="${branches} for-3.14/dt" # On for-3.14/dmas-resets-rework -branches="${branches} for-3.14/defconfig" # On v3.13-rc1 +branches="${branches} for-3.15/drivers" # On v3.14-rc1 +branches="${branches} for-3.15/dt" # On v3.14-rc1 +branches="${branches} for-3.15/defconfig" # On v3.14-rc1 |