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>
This commit is contained in:
Sascha Hauer 2011-09-20 10:09:08 +02:00
7 changed files with 66 additions and 130 deletions