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

..

acornfb.h

…

debug-macro.S

…

entry-macro.S

…

hardware.h

…

io.h

[ARM] rpc: remove obsolete IO accessors

2008-11-28 15:49:11 +00:00

irqs.h

[ARM] give RiscPC a NR_IRQS definition and remove default

2008-11-29 19:14:31 +00:00

isa-dma.h

[ARM] dma: Use sensible DMA parameters for Acorn drivers

2008-12-11 16:37:06 +00:00

memory.h

[ARM] remove a common set of __virt_to_bus definitions

2008-11-28 15:36:49 +00:00

system.h

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

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

timex.h

…

uncompress.h

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

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

vmalloc.h

…