From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 25 Oct 2012 13:40:53 +0000 (+0200)
Subject: Merge branch 'next/soc' into for-next
X-Git-Tag: next-20121026~15^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4aa79e73cce29102c65bd6cd24b3a837782287e8;p=karo-tx-linux.git

Merge branch 'next/soc' into for-next
---

4aa79e73cce29102c65bd6cd24b3a837782287e8
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 5936c900e822,000000000000..4702059607ef
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,8 -1,0 +1,11 @@@
 +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 
++
++next/soc:
++ux500/core		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core