]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'imx-features' and 'imx-cleanup' into master
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 7 Sep 2011 21:05:55 +0000 (23:05 +0200)
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 7 Sep 2011 21:05:55 +0000 (23:05 +0200)
commitea754946551b676d552493a501dcbd751ee679a5
tree085fbe49ab74050b9e3d3ebb224dbd9c8cba5395
parent6cc766a218190fedf076aedcbeb2924ff1168c26
parent04871e934818988c1da318ec0a15f87065cd1ca2
Merge branch 'imx-features' and 'imx-cleanup' into master

Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/mach-mx5/Kconfig
12 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/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