git.stricted.de - GitHub/LineageOS/android_kernel_motorola

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

author	Arnd Bergmann <arnd@arndb.de>
	Fri, 7 Oct 2011 19:57:31 +0000 (21:57 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Fri, 7 Oct 2011 19:57:31 +0000 (21:57 +0200)
commit	526b264163068f77c5f2409031f5e25caf3900a9
tree	196e7581f1546e48ba392ff099f369e5c622636b	tree \| snapshot (tar.gz zip)
parent	4c4cbce68f57555cddb9d77da333bf50875148ce	commit \| diff
parent	05d900c9d8ce536c6792efb323c82b1c97b54bf9	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-armadillo5x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx1ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-vpr200.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51sd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_babbage.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikamx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikasb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx53_ard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/devices-imx51.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/mx51_efika.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx23evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx28evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-stmp378x_devb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/devices/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	diff1 \|	diff2 \|	blob \| history

RSS Atom

arch/arm/mach-imx/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-armadillo5x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx1ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-vpr200.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-cpuimx51sd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_babbage.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikamx.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx51_efikasb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx53_ard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/devices-imx51.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/mx51_efika.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx23evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-mx28evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/mach-stmp378x_devb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/devices/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	diff1 \|	diff2 \|	blob \| history