]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:03:47 +0000 (23:03 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:04:21 +0000 (23:04 +0100)
1  2 
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/dove.dtsi

index 822d4a20684f56d64eb9b6ffefd2f9ec77af5074,0000000000000000000000000000000000000000..ab15e7c0b61fa1c53ac04e6dbbd492ad065b0e04
mode 100644,000000..100644
--- /dev/null
@@@ -1,38 -1,0 +1,42 @@@
 +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/cleanup
 +      samsung/cleanup-s3c
 +                git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s3c
 +      samsung/cleanup-s5p
 +                git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s5p
 +      clksrc/cleanup
 +                git://sources.calxeda.com/kernel/linux.git tags/clksrc-cleanup-for-3.10
 +
 +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>
 +
++next/dt
++      mvebu/dt
++              git://git.infradead.org/users/jcooper/linux.git tags/mvebu_dt_for_v3.10
++
 +next/drivers
 +      samsung/timer
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/timer-samsung
 +              depends on samsung/cleanup-s3c
 +      samsung/irq-s3c24xx
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/irq-s3c24xx
 +      samsung/pinctrl-exynos
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/pinctrl-exynos
 +
Simple merge