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>
Showing
arch/arm/mach-gemini/idle.c
0 → 100644
arch/arm/mach-rpc/fiq.S
0 → 100644
Please register or sign in to comment