[ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel
commitbcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0
authorBen Dooks <ben-linux@fluff.org>
Mon, 18 May 2009 15:32:29 +0000 (18 16:32 +0100)
committerBen Dooks <ben-linux@fluff.org>
Mon, 18 May 2009 15:32:29 +0000 (18 16:32 +0100)
tree6a4345fe0f908d60f52085b97818be705c62af8e
parent543899f610799426babb5313682fd9c249e34677
parent0b13406a1f1928ec71e81dde52cb62d72ffd28ef
[ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel

Merge branch 'next-s3c64xx-dma2' into for-rmk-devel

Conflicts:

arch/arm/plat-s3c64xx/Makefile
arch/arm/plat-s3c/Kconfig
arch/arm/plat-s3c/Makefile
arch/arm/plat-s3c64xx/Kconfig
arch/arm/plat-s3c64xx/Makefile