From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 10 Jul 2008 15:41:50 +0000 (+0100)
Subject: Merge branch 'imx' into devel
X-Git-Tag: v2.6.27-rc1~850^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0006314d37639714da9658cf4ff3f1f9f420764;p=pandora-kernel.git

Merge branch 'imx' into devel

Conflicts:

	arch/arm/mm/Kconfig
---

f0006314d37639714da9658cf4ff3f1f9f420764
Reading git-diff-tree failed