From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 6 Dec 2010 08:36:17 +0000 (+0100)
Subject: Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
X-Git-Tag: v2.6.38-rc1~38^2~3^2~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e44e059588e1d91f3a1974d2ce3348864d1d799;p=pandora-kernel.git

Merge commit 'v2.6.37-rc4' into imx-for-2.6.38

Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

0e44e059588e1d91f3a1974d2ce3348864d1d799
Reading git-diff-tree failed