Merge remote branch 'arm-soc/next/devel2' into next-samsung-dt

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/mach-exynos4/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-mmp/Makefile
Simple merge

diff --cc arch/arm/mach-mmp/brownstone.c
Simple merge

diff --cc arch/arm/mach-mmp/mmp2.c
Simple merge