From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 27 Nov 2008 12:39:43 +0000 (+0000)
Subject: Merge branch 'clps7500' into devel
X-Git-Tag: v2.6.29-rc1~559^2~85
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31bccbf39208133415000520c79ebe7b291786df;p=pandora-kernel.git

Merge branch 'clps7500' into devel

Conflicts:

	arch/arm/Kconfig
---

31bccbf39208133415000520c79ebe7b291786df
Reading git-diff-tree failed