linux/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 [ARM] dma: rejig DMA initialization 2008-12-11 14:32:43 +00:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
leds.c locking, ARM: Annotate low level hw locks as raw 2011-09-13 11:12:14 +02:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pci.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-07-29 23:35:05 -07:00