From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 14 Oct 2008 21:24:51 +0000 (+0100)
Subject: Merge branch 's3c-move' into devel
X-Git-Tag: v2.6.28-rc1~293^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4;p=pandora-kernel.git

Merge branch 's3c-move' into devel

Conflicts:

	arch/arm/mach-versatile/core.c
---

7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4
Reading git-diff-tree failed