]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'imx-cleanup', 'imx-fixes' and 'imx-features' into master
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 13 Sep 2011 09:36:42 +0000 (11:36 +0200)
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 13 Sep 2011 09:36:42 +0000 (11:36 +0200)
commit652f448d1c6aa32dcd92f531ed641ed3b9f58fbd
treed30ac01e0955421765508cbd22d8ce0a247f57f9
parent3e1f99cd0c4af47c64a3c79005f1ee70a02f4182
parented0903202c51551a10c3cc732ca2d3a9d99ea5c0
parent6cc766a218190fedf076aedcbeb2924ff1168c26
Merge branches 'imx-cleanup', 'imx-fixes' and 'imx-features' into master

Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/mach-mx5/Kconfig
13 files changed:
arch/arm/mach-imx/Makefile
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikasb.c
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx51.h
arch/arm/mach-mx5/mx51_efika.c
arch/arm/mach-mxs/clock-mx28.c
arch/arm/mach-mxs/mach-mx23evk.c
arch/arm/mach-mxs/mach-mx28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
arch/arm/plat-mxc/devices/Kconfig
arch/arm/plat-mxc/include/mach/common.h