From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 20 Sep 2011 08:09:08 +0000 (+0200)
Subject: Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup
X-Git-Tag: v3.2-rc1~98^2~7^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6da5ce1728e3058312b6cf36786189002de1407d;p=pandora-kernel.git

Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup

Conflicts:
	arch/arm/mach-mx5/Makefile

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

6da5ce1728e3058312b6cf36786189002de1407d
Reading git-diff-tree failed