From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 20 May 2010 09:55:32 +0000 (+0900)
Subject: ARM: Merge for-2635-4/s5pv210-boards
X-Git-Tag: v2.6.35-rc1~264^2~1^2^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea5a4e209ddca984bbb5803b30d5e013e631f9ac;p=pandora-kernel.git

ARM: Merge for-2635-4/s5pv210-boards

Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1

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

ea5a4e209ddca984bbb5803b30d5e013e631f9ac
Reading git-diff-tree failed