git.stricted.de - GitHub/moto-9609/android_kernel_motorola

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

author	Arnd Bergmann <arnd@arndb.de>
	Tue, 1 Nov 2011 16:12:22 +0000 (17:12 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 1 Nov 2011 16:12:22 +0000 (17:12 +0100)
commit	c72dbae971400e466ad9ff16c920cd6d9d8c55a1
tree	7a0ebba8b14d889a8b42edfa1272be222b908a82	tree \| snapshot (tar.gz zip)
parent	7e1efcf5d2039fb7a91e21df32f4175dbca4d61c	commit \| diff
parent	b4cbb8a4e602ea77b0525d06eff89c6a6070dab3	commit \| diff

Merge branch 'imx/devel' into next/dt

The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.

Conflicts:
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/memory.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

42 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-armadillo5x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27ipcam.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-kzm_arm11_01.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx1ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx21ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx25_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lilly.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31moboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx35_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mxt_td60.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pca100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm037.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm038.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm043.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-qong.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-scb9328.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/Makefile	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/board-mx53_evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx53_loco.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx53_smd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	diff1 \|	diff2 \|	blob \| history

RSS Atom

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-armadillo5x0.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx27.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-cpuimx35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27ipcam.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx27lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-kzm_arm11_01.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx1ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx21ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx25_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx27ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31ads.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lilly.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31lite.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx31moboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mx35_3ds.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-mxt_td60.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pca100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm037.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm038.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-pcm043.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-qong.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-scb9328.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/Makefile	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/board-mx53_evk.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx53_loco.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx53_smd.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/common.h	diff1 \|	diff2 \|	blob \| history