From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 25 Oct 2012 13:34:31 +0000 (+0200)
Subject: Merge branches 'fixes' and 'next/cleanup' into for-next
X-Git-Tag: next-20121026~15^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3804d285703e60e8054e925d79188ffa531f4aad;p=karo-tx-linux.git

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

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

3804d285703e60e8054e925d79188ffa531f4aad
diff --cc arch/arm/arm-soc-for-next-contents.txt
index cb4e35a5dbf3,000000000000,000000000000..5936c900e822
mode 100644,000000,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ 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