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 e34382734f795b5f9962b3a7ebba297b2e1c5896..983e07b2f823d793c07eb7e73c17a2957cd43f8e 100644 (file)
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -1,35 +1,51 @@
 fixes
-       patch
-               bus: uniphier-system-bus: revive tristate prompt
-               ARM: realview: use const and __initconst for smp_operations
-               ARM: tango: use const and __initconst for smp_operations
-               ARM: tango: use "depends on" instead of "if" after prompt
-               ARM: realview: use "depends on" instead of "if" after prompt
-               ARM64: tegra: Add chosen node for tegra132 norrin
-       <no branch> (e873cc022ce5e2c04bbc53b5874494b657e29d3f)
-               git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 tags/at91-fixes
-       <no branch> (ab342c77fa60a30fce4d4228f88fd1b7bf566055)
-               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.5/fixes-rc1
-       <no branch> (ff61ee84e7aa5842d9e33c0b442f0b43a6a44eaf)
-               git://git.infradead.org/linux-mvebu tags/mvebu-fixes-4.5-1
-       <no branch> (aeb2ee5683e51305aff274d8b0a50af69b3ab310)
-               git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux tags/vexpress-for-v4.5/fixes-rc2
 
 next/fixes-non-critical
 
 next/cleanup
-
-next/multiplatform
+       patch
+               ARM: drop unused Makefile.boot of Multiplatform SoCs
+               ARM: integrator: remove redundant select in Kconfig
+               ARM: netx: remove redundant "depends on ARCH_NETX"
+       renesas/cleanup
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-cleanup-for-v4.6
+       mvebu/cleanup
+               git://git.infradead.org/linux-mvebu tags/mvebu-cleanup-4.6-1
 
 next/soc
+       patch
+               ARM: debug: add support for Palmchip BK-310x UART
+       mvebu/drivers
+               git://git.infradead.org/linux-mvebu tags/mvebu-drivers-4.6-1
+
+next/arm64
+       patch
+               arm64: defconfig: add spmi and usb related configs
 
 next/dt
 
 next/dt64
+       patch
+               MAINTAINERS: Adding Maintainers for AMD Seattle Device Tree
+               dtb: amd: Fix GICv2 hypervisor and virtual interface sizes
+               dtb: amd: Fix DMA ranges in device tree
+               dtb: amd: Fix typo in SPI device nodes
+               dtb: amd: Misc changes for I2C device nodes
+               dtb: amd: Misc changes for SATA device tree nodes
+               dtb: amd: Misc changes for GPIO devices
+               dtb: amd: Add PERF CCN-504 device tree node
+               dtb: amd: Add KCS device tree node
+               dtb: amd: Add AMD XGBE device tree file
+               dtb: amd: Add support for new AMD Overdrive boards
+               dtb: amd: Add support for AMD/Linaro 96Boards Enterprise Edition Server board
+       renesas/dt64
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-arm64-dt-for-v4.6
 
 next/defconfig
-
-next/config64
+       renesas/defconfig
+               git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas tags/renesas-defconfig-for-v4.6
+       mvebu/defconfig
+               git://git.infradead.org/linux-mvebu tags/mvebu-defconfig-4.6-1
 
 next/drivers