From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 15 Mar 2013 21:28:51 +0000 (+0100)
Subject: Merge branch 'next/multiplatform' into for-next
X-Git-Tag: next-20130320~13^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=07a6d6c3c2677d355056532d32c1c84ab7a3ad45;p=karo-tx-linux.git

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

07a6d6c3c2677d355056532d32c1c84ab7a3ad45
diff --cc arch/arm/arm-soc-for-next-contents.txt
index d5391a599039,000000000000..4868dc1c0f36
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,12 -1,0 +1,21 @@@
 +for-next contents for 3.10: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +	<topic branch>
 +		<contents>
 +		<...>
 +	<...>
 +
 +next/fixes-non-critical
 +	ux500/dt-fixes
 +		  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-fixes
++
++next/multiplatform
++	nomadik/multiplatform
++		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-multiplatform
++	spear/multiplatform
++		patches <1363106816-9603-1-git-send-email-arnd@arndb.de>
++	cns3xxx/multiplatform
++		patches <1363299271-8283-1-git-send-email-arnd@arndb.de>
++