Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup
authorSascha Hauer <s.hauer@pengutronix.de>
Tue, 4 Oct 2011 08:55:53 +0000 (10:55 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Tue, 4 Oct 2011 08:55:53 +0000 (10:55 +0200)
commit05d900c9d8ce536c6792efb323c82b1c97b54bf9
tree18e25b63029029da77057c7bfa02f9daacaa1c3e
parent6da5ce1728e3058312b6cf36786189002de1407d
parentf548897ffc0510885af27e22a11f449fe5e0cbbd
parenta6d3404891834ed3cd2c80d77d43094205d7390b
Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup
arch/arm/mach-imx/Makefile
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/common.h