original_kernel/arch/arm/mach-nomadik
Russell King 7b9dd47136 Merge branch 'restart' into for-linus
Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
2012-01-05 13:25:27 +00:00
..
include/mach Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
Kconfig
Makefile
Makefile.boot
board-nhk8815.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
clock.c
clock.h
cpu-8815.c ARM: restart: nomadik: use new restart hook 2012-01-05 12:57:16 +00:00
cpu-8815.h ARM: restart: nomadik: use new restart hook 2012-01-05 12:57:16 +00:00
i2c-8815nhk.c