From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 3 Dec 2009 21:33:01 +0000 (+0000)
Subject: ARM: Merge next-s3c24xx-dev-rtp
X-Git-Tag: v2.6.33-rc1~340^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f18ea8276bc6b0f8584c442905e9badc2acc8785;p=pandora-kernel.git

ARM: Merge next-s3c24xx-dev-rtp

Merge branch 'next-s3c24xx-dev-rtp' into for-rmk

Conflicts:

	arch/arm/mach-s3c2440/mach-anubis.c
---

f18ea8276bc6b0f8584c442905e9badc2acc8785
Reading git-diff-tree failed