Merge branches 'fixes' and 'next/cleanup' into for-next

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/arm-soc-for-next-contents.txt
index cb4e35a5dbf3ff02fe37c5fbc22afc45bbb60771,0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5936c900e8226a3f493e492df8a31ae2192fbe7b
mode 100644,000000,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@@ -1,7 -1,0 -1,0 +1,8 @@@@
 ++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