Merge branch 'imx/devel' into imx/imx6q

Conflicts:
	arch/arm/plat-mxc/include/mach/memory.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-imx/mach-armadillo5x0.c
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx27.c
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx35.c
Simple merge

diff --cc arch/arm/mach-imx/mach-eukrea_cpuimx25.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx27ipcam.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx27lite.c
Simple merge

diff --cc arch/arm/mach-imx/mach-kzm_arm11_01.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx1ads.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx21ads.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx25_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx27_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx27ads.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31ads.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31lilly.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31lite.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31moboard.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx35_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mxt_td60.c
Simple merge

diff --cc arch/arm/mach-imx/mach-pca100.c
Simple merge

diff --cc arch/arm/mach-imx/mach-pcm037.c
Simple merge

diff --cc arch/arm/mach-imx/mach-pcm038.c
Simple merge

diff --cc arch/arm/mach-imx/mach-pcm043.c
Simple merge

diff --cc arch/arm/mach-imx/mach-qong.c
Simple merge

diff --cc arch/arm/mach-imx/mach-scb9328.c
Simple merge

diff --cc arch/arm/mach-mx5/board-cpuimx51.c
Simple merge

diff --cc arch/arm/mach-mx5/board-cpuimx51sd.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_3ds.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_babbage.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikamx.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikasb.c
Simple merge