]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Tue, 28 May 2013 04:22:20 +0000 (21:22 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 28 May 2013 04:22:51 +0000 (21:22 -0700)
* next/dt:
  ARM: nomadik: move the pin configuration to DT
  ARM: nomadik: add led and key for S8815
  ARM: nomadik: register clocksource from device tree
  ARM: nomadik: convert all clocks except timer to dt
  clocksource: nomadik-mtu: support of probe

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/arm-soc-for-next-contents.txt

index fcb414fc2e6d68d9367d9b633112173c52e16cea,0000000000000000000000000000000000000000..d782d35fa175b05cbf1f2352f52046226a0c4071
mode 100644,000000..100644
--- /dev/null
@@@ -1,18 -1,0 +1,21 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
++next/dt
++      nomadik/dt
++              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +