From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 22 Nov 2011 10:32:39 +0000 (+0100)
Subject: Merge branch 'cleanups/assorted' into imx-fixes-for-arnd
X-Git-Tag: v3.2-rc4~7^2~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743;p=pandora-kernel.git

Merge branch 'cleanups/assorted' into imx-fixes-for-arnd

Conflicts:
	arch/arm/mach-imx/mm-imx3.c

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

9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743
Reading git-diff-tree failed