Merge branch 'renesas/soc' into next/soc2

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-gta02.c
Simple merge

diff --cc arch/arm/mach-s3c2440/mach-rx1950.c
Simple merge

diff --cc arch/arm/mach-ux500/Kconfig
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc drivers/mmc/host/mmci.c
Simple merge