Merge branch 'cleanups/assorted' into imx-fixes-for-arnd
authorSascha Hauer <s.hauer@pengutronix.de>
Tue, 22 Nov 2011 10:32:39 +0000 (11:32 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Tue, 22 Nov 2011 10:32:39 +0000 (11:32 +0100)
commit9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743
tree1ebcd9c9812a0b2857ef9bae39a399c3283dcdb1
parent13420c6b5bac9b05cf9a0ba9c46b8e1d18d45730
parentca06679d758933b726c2677b523a26bc581eadcf
Merge branch 'cleanups/assorted' into imx-fixes-for-arnd

Conflicts:
arch/arm/mach-imx/mm-imx3.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-imx/mm-imx3.c
arch/arm/plat-mxc/system.c