diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:54:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:54:27 +0200 |
| commit | 3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64 (patch) | |
| tree | 49bbe7b27f8571c7716e9cbc7fbbe462ea82077a /scripts | |
| parent | Merge tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/li... (diff) | |
| parent | ARM: tegra: pm: remove duplicated include from pm.c (diff) | |
| download | linux-3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64.tar.gz linux-3afeb0a046af159f0ff97a20cf6ebc44d0d2bd64.zip | |
Merge branch 'tegra/soc' into next/multiplatform
This is a dependency for the tegra multiplatform series.
Conflicts:
drivers/clocksource/tegra20_timer.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions