kernel-fxtec-pro1x/arch/arm/mach-iop33x
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
iq80331.c ARM: restart: iop3xx: use new restart hook 2012-01-05 12:57:13 +00:00
iq80332.c ARM: restart: iop3xx: use new restart hook 2012-01-05 12:57:13 +00:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig
Makefile
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
uart.c