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

Conflicts:

arch/arm/plat-s3c64xx/Makefile


Trivial merge