kernel-fxtec-pro1x/arch/arm/mach-shark
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
core.c ARM: restart: shark: use new restart hook 2012-01-05 12:57:20 +00:00
dma.c
irq.c
leds.c locking, ARM: Annotate low level hw locks as raw 2011-09-13 11:12:14 +02:00
Makefile
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pci.c