linux/arch/arm/mach-prima2
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
clock.c
common.h ARM: restart: prima2: use new restart hook 2012-01-05 12:57:17 +00:00
irq.c
l2x0.c
lluart.c
Makefile
Makefile.boot
pm.c ARM: CSR: PM: fix build error due to undeclared 'THIS_MODULE' 2011-12-02 11:03:41 +08:00
pm.h
prima2.c ARM: restart: prima2: use new restart hook 2012-01-05 12:57:17 +00:00
rstc.c ARM: restart: prima2: use new restart hook 2012-01-05 12:57:17 +00:00
rtciobrg.c
sleep.S
timer.c Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:22:01 -07:00