Merge branches 'fixes' and 'next/fixes-non-critical' into for-next

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index d9f353a241a60ee180d4c0813660d637292247f9,0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..611493b791cf8579036be4d75bc294a4940ada11
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,14 -1,0 -1,0 +1,15 @@@@
 ++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
 ++
 ++next/smp:
 ++socfpga/smp          patch from Dinh Nguyen <dinguyen@altera.com>