linux/arch/arm/mach-nomadik
Arnd Bergmann 2cbe23e3a4 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>
2012-03-21 14:27:34 +00:00
..
include/mach Merge branch 'tegra/cleanups' into next/timer 2012-03-21 14:27:34 +00:00
board-nhk8815.c Merge branch 'tegra/cleanups' into next/timer 2012-03-21 14:27:34 +00:00
clock.c
clock.h
cpu-8815.c ARM: amba: nomadik: use common amba device initializers 2012-01-26 19:59:29 +00:00
cpu-8815.h ARM: restart: nomadik: use new restart hook 2012-01-05 12:57:16 +00:00
i2c-8815nhk.c
Kconfig
Makefile
Makefile.boot