From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 11 Feb 2011 07:32:18 +0000 (+0100)
Subject: Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
X-Git-Tag: v2.6.39-rc1~434^2~5^2~91
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f19693a17c6705e197eb24d4618060eaac1b535c;p=pandora-kernel.git

Merge commit 'v2.6.38-rc4' into imx-for-2.6.39

Conflicts:
	arch/arm/mach-mxs/clock-mx28.c

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

f19693a17c6705e197eb24d4618060eaac1b535c
Reading git-diff-tree failed