Merge branch 'next/multiplatform' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index d5391a599039d5b4a6ba35713d8cd4d1979aefa4,0000000000000000000000000000000000000000..4868dc1c0f3679104b253dce7c91dd8e2a9b9e4e
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,12 -1,0 +1,21 @@@
 +for-next contents for 3.10: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +next/fixes-non-critical
 +      ux500/dt-fixes
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-fixes
++
++next/multiplatform
++      nomadik/multiplatform
++              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-multiplatform
++      spear/multiplatform
++              patches <1363106816-9603-1-git-send-email-arnd@arndb.de>
++      cns3xxx/multiplatform
++              patches <1363299271-8283-1-git-send-email-arnd@arndb.de>
++