From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 3 Dec 2009 21:53:10 +0000 (+0000)
Subject: ARM: Merge next-s3c64xx-updates
X-Git-Tag: v2.6.33-rc1~340^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=009f742bded4cc7c89b901d59452fbfc0eb292c5;p=pandora-kernel.git

ARM: Merge next-s3c64xx-updates

Merge branch 'next-s3c64xx-updates' into for-rmk

Conflicts:

	arch/arm/plat-s3c/dev-hsmmc2.c
	arch/arm/plat-s3c/include/plat/sdhci.h
---

009f742bded4cc7c89b901d59452fbfc0eb292c5
Reading git-diff-tree failed