From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 19 May 2010 09:05:15 +0000 (+0900)
Subject: ARM: Merge for-2635/s5p-dma
X-Git-Tag: v2.6.35-rc1~500^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e8ff636beb6ee5c87868a6081cc4f95b1ccd713;p=pandora-kernel.git

ARM: Merge for-2635/s5p-dma

Merge branch 'for-2635/s5p-dma' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s5pv210/Makefile
---

1e8ff636beb6ee5c87868a6081cc4f95b1ccd713
Reading git-diff-tree failed