From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 22 Feb 2010 23:38:26 +0000 (+0000)
Subject: ARM: Merge next-samsung-s3c64xx-platdeletion
X-Git-Tag: v2.6.34-rc2~66^2~3^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f0ff702cdf51472750f4b6042866f1b83a11215;p=pandora-kernel.git

ARM: Merge next-samsung-s3c64xx-platdeletion

Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung

Conflicts:

	arch/arm/mach-s3c64xx/Makefile (fixed)
---

7f0ff702cdf51472750f4b6042866f1b83a11215
Reading git-diff-tree failed