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)
commit6da5ce1728e3058312b6cf36786189002de1407d
tree47df7114d1d3057461a40ce277052f6caabad5cb
parent04871e934818988c1da318ec0a15f87065cd1ca2
parenta35b91474c329ecefa793e4e7bb4103c88f4a16f
parent4c54239058772160da123167de89603830815a88
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>
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h
arch/arm/plat-mxc/include/mach/mx51.h