From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 18 Dec 2008 16:17:37 +0000 (+0000)
Subject: Merge branch 'next-s3c64xx-device' into next-merged
X-Git-Tag: v2.6.29-rc1~559^2~9^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56c035c9ce1f1850969778af6a4cc0b99089b6c8;p=pandora-kernel.git

Merge branch 'next-s3c64xx-device' into next-merged

Conflicts:

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

56c035c9ce1f1850969778af6a4cc0b99089b6c8
Reading git-diff-tree failed