arm-soc: document merges

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

diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt
index 5bb776a79400f105a8105a82564422602652fbed..1407dda05dc54354d8515a2f8a57ec7b6ef9fca6 100644 (file)
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -21,12 +21,25 @@ fixes
                git://git.linaro.org/people/pawel.moll/linux tags/ccn/fixes-for-4.8-v2
        patch
                ARM: multi_v7_defconfig: update XILINX_VDMA
+               arm64: dts: Fix broken architected timer interrupt trigger
 
 next/fixes-non-critical
 
 next/cleanup
+       <no branch> (8f2c00629e43b0f32785c3e89b61cca89058929a)
+               git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator tags/realview-broomstick-sweep
+       patch
+               ARM: clps711x: remove extraneous files
+       omap/legacy
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.8/legacy-signed
+       <no branch> (502ad2a669f146e0801973c42e55478322f2d382)
+               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.9/soc-signed
 
 next/soc
+       davinci/soc
+               git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci tags/davinci-for-v4.9/soc
+       samsung/soc
+               git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux tags/samsung-soc-4.9
 
 next/arm64
 
@@ -42,8 +55,10 @@ next/defconfig
                git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v4.9/defconfig-signed
 
 next/drivers
-
-next/dt
-
-next/dt64
+       omap/gpmc
+               https://github.com/rogerq/linux tags/gpmc-omap-for-v4.9
+       drivers/reset
+               git://git.pengutronix.de/git/pza/linux tags/reset-for-4.9
+       <no branch> (23540d6e2f3193b946c4de43e3f9654fa6d23fe7)
+               Merge commit 'http://github.com/rogerq/linux gpmc-omap-v4.8-rc1' into next/drivers