From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 20 May 2010 10:38:30 +0000 (+0900)
Subject: ARM: Merge for-2635-4/s5p-devs
X-Git-Tag: v2.6.35-rc1~264^2~1^2^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84eb9ecce20acfd287ba0d623fe5e99bfab08686;p=pandora-kernel.git

ARM: Merge for-2635-4/s5p-devs

Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s5pc100/include/mach/map.h
---

84eb9ecce20acfd287ba0d623fe5e99bfab08686
Reading git-diff-tree failed