Russell King 3ad55155b2 Merge branch 'devel-stable' into for-next ... Conflicts: arch/arm/kernel/entry-armv.S		2011-07-22 23:09:07 +01:00
..
include/mach	Merge branch 'devel-stable' into for-next	2011-07-22 23:09:07 +01:00
core.c	ARM: mach-shark: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size	2011-07-18 15:30:04 -04:00
dma.c
irq.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
leds.c
Makefile
Makefile.boot
pci.c	ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup	2010-05-24 20:40:11 +01:00