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

…

core.c

…

dma.c

…

irq.c

…

leds.c

…

Makefile

…

Makefile.boot

…

pci.c

…