Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup
authorSascha Hauer <s.hauer@pengutronix.de>
Tue, 20 Sep 2011 08:09:08 +0000 (10:09 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Tue, 20 Sep 2011 08:09:08 +0000 (10:09 +0200)
Conflicts:
arch/arm/mach-mx5/Makefile

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

Trivial merge