Arnd Bergmann 5725aeae5f Merge branch 'depends/rmk/memory_h' into next/fixes ... Fix up all conflicts between the memory.h cleanup and bug fixes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2011-11-01 00:25:01 +01:00
..
include/mach	ARM: mach-prima2: remove mach/memory.h	2011-10-13 12:49:50 -04:00
clock.c	ARM: CSR: add missing sentinels to of_device_id tables	2011-09-11 09:11:26 +08:00
common.h	ARM: CSR: mapping early DEBUG_LL uart	2011-07-09 07:20:51 +08:00
irq.c	ARM: CSR: add missing sentinels to of_device_id tables	2011-09-11 09:11:26 +08:00
l2x0.c	ARM: mach-prima2: remove mach/memory.h	2011-10-13 12:49:50 -04:00
lluart.c	ARM: CSR: mapping early DEBUG_LL uart	2011-07-09 07:20:51 +08:00
Makefile	ARM: CSR: initializing L2 cache	2011-07-09 07:21:53 +08:00
Makefile.boot	ARM: CSR: Adding CSR SiRFprimaII board support	2011-07-09 07:19:28 +08:00
prima2.c	ARM: mach-prima2: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size	2011-09-06 17:25:54 -04:00
rstc.c	ARM: CSR: add missing sentinels to of_device_id tables	2011-09-11 09:11:26 +08:00
timer.c	ARM: CSR: add missing sentinels to of_device_id tables	2011-09-11 09:11:26 +08:00