diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 14:27:34 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 14:27:34 +0000 |
| commit | 2cbe23e3a432e3d09a849adb197c8fcc09e7391d (patch) | |
| tree | 711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06 /arch/blackfin/kernel/setup.c | |
| parent | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (diff) | |
| parent | ed1b4acc43b0c3289faa30cf184f322ab70a5be3 (diff) | |
| download | linux-2cbe23e3a432e3d09a849adb197c8fcc09e7391d.tar.bz2 | |
Merge branch 'tegra/cleanups' into next/timer
Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-vexpress/core.h
The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/blackfin/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions