Russell King 22b61a11fd Merge branch 'dma' into devel ...

Conflicts:

	arch/arm/plat-mxc/dma-mx1-mx2.c

2009-02-21 21:42:50 +00:00

..

include/mach

[ARM] 5363/1: Shark cleanup and new defconfig

2009-02-19 11:30:20 +00:00

core.c

[ARM] 5363/1: Shark cleanup and new defconfig

2009-02-19 11:30:20 +00:00

dma.c

[ARM] dma: rejig DMA initialization

2008-12-11 14:32:43 +00:00

irq.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

leds.c

[ARM] 5363/1: Shark cleanup and new defconfig

2009-02-19 11:30:20 +00:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile.boot

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pci.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00