]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf1c7e4ca53290322d73250e8b6ee90d054cf8a50
tree1ebcd9c9812a0b2857ef9bae39a399c3283dcdb1
parentbe057ba2cb2d949fa0ccfba2af89750e81a7d9e7
parentcbcea299d5adacf08143ad32fc12fad99f99cc63
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