From: Olof Johansson <olof@lixom.net>
Date: Wed, 1 Apr 2015 23:59:05 +0000 (-0700)
Subject: ARM: SoC: Document merges
X-Git-Tag: KARO-TXA5-2015-06-26~151^2~47
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7931cd8b77821af68955a556627623ef94769c4d;p=karo-tx-linux.git

ARM: SoC: Document merges

Signed-off-by: Olof Johansson <olof@lixom.net>
---

diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt
index 92209501cae2..68c8a892ee97 100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -22,6 +22,11 @@ next/multiplatform
 	shmobile/multiplatform-r8a7778
 		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-r8a7778-ccf-and-multiplatform-for-v4.1
 		contains drivers/simple-pm-bus
+	shmobile/multiplatform-r8a73a4
+		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-r8a73a4-ccf-and-multiplatform-for-v4.1
+	shmobile/multiplatform-sh73a0
+		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-sh73a0-multiplatform-for-v4.1
+		contains renesas/dt
 
 next/soc
 	renesas/soc
@@ -39,6 +44,8 @@ next/soc
 	renesas/da9063-da9210-quirk
 		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-da9063-da9210-quirk-for-v4.1
 
+next/boards
+
 next/dt
 	renesas/dt
 		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-dt-for-v4.1
@@ -68,3 +75,8 @@ next/arm64
 next/defconfig
 	mvebu/defconfig
 		git://git.infradead.org/linux-mvebu tags/mvebu-defconfig-4.1
+	patch
+		ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig
+
+fixes
+