]> 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)
commit72ee11d88ceb36815f84017bfaac6736d511767e
tree1ebcd9c9812a0b2857ef9bae39a399c3283dcdb1
parente89cd7eff02b8b1dd8f419dbb1a5828c78384329
parent7f3832b50746cb6062a303e321dbad3b2b743ec9
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