Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Russell King [Sat, 29 Nov 2008 19:35:07 +0000 (19:35 +0000)]
1  2 
arch/arm/mach-s3c2410/dma.c
arch/arm/mach-s3c2412/dma.c
arch/arm/mach-s3c2440/dma.c
arch/arm/mach-s3c2443/dma.c
drivers/mtd/nand/s3c2410.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge