Merge branch 'next/multiplatform' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index ce1b8a3443ac8295383d8cede514f3e0aa7d84ed,0000000000000000000000000000000000000000..37f4a9ddb6ce9c1c16470e7f0fb9e51f2e47beab
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,16 -1,0 +1,19 @@@
- vt8500/cleanup                git://server.prisktech.co.nz/git/linuxwmt.git/ tags/cleanup-for-3.8 
 +arm-soc for-next contents for 3.8:
 +
 +next/fixes-non-critical:
 +vexpress/fixes                git://git.linaro.org/people/pawelmoll/linux.git vexpress-fixes
 +
 +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
 +clps711x/soc          patches from Alexander Shiyan <shc_work@mail.ru>
 +
 +next/smp:
 +socfpga/smp           patch from Dinh Nguyen <dinguyen@altera.com>
++
++next/multiplatform
++vt8500/multiplatform  git://server.prisktech.co.nz/git/linuxwmt.git/ tags/armsoc-for-3.8

diff --cc arch/arm/mach-vt8500/vt8500.c
Simple merge