diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-03-19 20:46:32 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 09:41:43 +0000 |
| commit | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (patch) | |
| tree | 065282434bde6ef9b4357c042705c5fcef3782ea /arch/arm/mach-tegra/Makefile | |
| parent | Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into next/timer (diff) | |
| parent | Merge branch 'renesas/fixes' into renesas/soc (diff) | |
| download | linux-dev-b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc.tar.xz linux-dev-b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc.zip | |
Merge branch 'renesas/timer' into next/timer
Conflicts:
arch/arm/mach-shmobile/timer.c
This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
0 files changed, 0 insertions, 0 deletions