]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arm-soc: update contents file
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Nov 2012 21:49:02 +0000 (22:49 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Nov 2012 21:49:02 +0000 (22:49 +0100)
After moving the vexpress/soc branch into next/soc2, I updated the
contents file but forgot to push the change. This fixes the file.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/arm-soc-for-next-contents.txt

index 3730811aa7996148ada0b1d4d1419e0976232a95..7de5c48911d167c7ed0eaf09a20979b6532e19bf 100644 (file)
@@ -15,7 +15,7 @@ imx/multiplatform     git://git.linaro.org/people/shawnguo/linux-2.6.git imx/multi-p
                        (pulled twice)
 vt8500/cleanup         git://server.prisktech.co.nz/git/linuxwmt.git/ tags/cleanup-for-3.8
 + cherry-pick of "ARM: pxa: use module_platform_driver macro"
-zynq/cleanup           git://git.xilinx.com/linux-xlnx.git arm-next                    
+zynq/cleanup           git://git.xilinx.com/linux-xlnx.git arm-next
 
 next/headers:
 omap/headers           git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap omap-for-v3.8/cleanup-headers-signed
@@ -32,7 +32,6 @@ nomadik/plat-removal  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-
 next/soc:
 ux500/core             git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core
 clps711x/soc           patches from Alexander Shiyan <shc_work@mail.ru>
-vexpress/soc           git://git.linaro.org/people/pawelmoll/linux vexpress-soc
 renesas/soc            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas soc
 calxeda/ecx-2000       git://sources.calxeda.com/kernel/linux.git tags/calxeda-ecx-2000
 integrator/irq         git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-irq
@@ -53,3 +52,11 @@ socfpga/smp          patch from Dinh Nguyen <dinguyen@altera.com>
 next/drivers:
 vexpress/drivers       git://git.linaro.org/people/pawelmoll/linux vexpress/drivers
 
+
+depends/clk:           common clock tree
+
+next/soc2
+vexpress/soc           git://git.linaro.org/people/pawelmoll/linux vexpress-soc
+                               depends on depends/clk
+
+