linux/arch/arm/mach-zynq
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
Makefile ARM: zynq: remove incorrectly deleted file 2011-07-28 16:02:53 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
common.c ARM: zynq: convert to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:14:02 +00:00
common.h ARM: Xilinx: merge board file into main platform code 2011-07-07 14:13:58 +00:00
timer.c