From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 18 May 2009 15:32:29 +0000 (+0100)
Subject: [ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel
X-Git-Tag: v2.6.31-rc1~344^2~10^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0;p=pandora-kernel.git

[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
---

bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0
Reading git-diff-tree failed