tree 711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06
parent b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc
parent ed1b4acc43b0c3289faa30cf184f322ab70a5be3
author Arnd Bergmann <arnd@arndb.de> 1332340054 +0000
committer Arnd Bergmann <arnd@arndb.de> 1332340054 +0000

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>