]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'imx/devel' into imx/imx6q
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 21:36:35 +0000 (23:36 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 21:36:38 +0000 (23:36 +0200)
commitf3fe21fb12c1f451e5a9e1a398c768b9a9cdb53c
treec49403a76b7747c7627babd629ec5b2f483c6230
parent32c82bb284fb2e63d0541a387551ceb9b94ecb23
parentb4cbb8a4e602ea77b0525d06eff89c6a6070dab3
Merge branch 'imx/devel' into imx/imx6q
34 files changed:
arch/arm/Kconfig
arch/arm/mach-imx/mach-armadillo5x0.c
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-imx/mach-imx27ipcam.c
arch/arm/mach-imx/mach-imx27lite.c
arch/arm/mach-imx/mach-kzm_arm11_01.c
arch/arm/mach-imx/mach-mx1ads.c
arch/arm/mach-imx/mach-mx21ads.c
arch/arm/mach-imx/mach-mx25_3ds.c
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-mx27ads.c
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-mx31ads.c
arch/arm/mach-imx/mach-mx31lilly.c
arch/arm/mach-imx/mach-mx31lite.c
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-imx/mach-mx35_3ds.c
arch/arm/mach-imx/mach-mxt_td60.c
arch/arm/mach-imx/mach-pca100.c
arch/arm/mach-imx/mach-pcm037.c
arch/arm/mach-imx/mach-pcm038.c
arch/arm/mach-imx/mach-pcm043.c
arch/arm/mach-imx/mach-qong.c
arch/arm/mach-imx/mach-scb9328.c
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/plat-mxc/include/mach/memory.h