]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b70ce15 80e4827)
Merge branch 'imx/devel' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Tue, 1 Nov 2011 16:12:22 +0000 (17:12 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 1 Nov 2011 16:12:22 +0000 (17:12 +0100)
commit9b409f04c7ffa127abdc016aab46a567154c72ed
tree7a0ebba8b14d889a8b42edfa1272be222b908a82tree | snapshot
parentb70ce15006fa300960eec9c5624adbd708a00fe1commit | diff
parent80e482715913d540baea919531c7cf35956c6cbfcommit | 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
Linux Kernel Source Tree.