]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'imx/cleanup' into imx/devel
authorArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:57:31 +0000 (21:57 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:57:31 +0000 (21:57 +0200)
commitf4dbe54da5f9159064993934f9eaf2a9423f7ee1
tree196e7581f1546e48ba392ff099f369e5c622636b
parent7d759fbbda85b7a4889db253fe0f3e67102e058a
parentcfd4ff2e91bcd9b04a705a09f6fc0c069495ffe1
Merge branch 'imx/cleanup' into imx/devel

This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
22 files changed:
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/mach-armadillo5x0.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-mx1ads.c
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-vpr200.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/board-cpuimx51.c
arch/arm/mach-mx5/board-cpuimx51sd.c
arch/arm/mach-mx5/board-mx51_3ds.c
arch/arm/mach-mx5/board-mx51_babbage.c
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikasb.c
arch/arm/mach-mx5/board-mx53_ard.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