Merge branch 'next/soc' into for-next

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 5936c900e8226a3f493e492df8a31ae2192fbe7b,0000000000000000000000000000000000000000..4702059607efa71e372291ddcf77ed202c666450
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,8 -1,0 +1,11 @@@
 +arm-soc for-next contents for 3.8:
 +
 +next/fixes-non-critical:
 +
 +next/cleanup:
 +imx/multiplatform     git://git.linaro.org/people/shawnguo/linux-2.6.git imx/multi-platform
 +                      (pulled twice)
 +vt8500/cleanup                git://server.prisktech.co.nz/git/linuxwmt.git/ tags/cleanup-for-3.8 
++
++next/soc:
++ux500/core            git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core