]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 78de344 6a9d10d)
Merge branch 'next/dt' into for-next
authorKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 22:17:25 +0000 (15:17 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 14 Oct 2013 22:17:59 +0000 (15:17 -0700)
commitaa2e3b2f2fc3c02ec4875bd757d259f4f7f95f70
tree9504daac1ba533d009cd9d9f579a3f063441cfe8tree | snapshot
parent78de34405c462daf3c23cc628bb4908b54999c11commit | diff
parent6a9d10d529db69244baab335fb02caba3d6ebbc9commit | diff
Merge branch 'next/dt' into for-next

* next/dt:
  dts: socfpga: Add support for Altera's SOCFPGA Arria V board
  ARM: socfpga: dts: fix s2f_* clock name
  ARM: socfpga: dts: cleanup indentation
  ARM: socfpga: dts: Add support for terasic SoCkit
  ARM: socfpga: dts: Move common nodes to cyclone5 dtsi
  arm: socfpga: Add clock for smp_twd timer

Signed-off-by: Kevin Hilman <khilman@linaro.org>
Conflicts:
arch/arm/boot/dts/Makefile
arch/arm/arm-soc-for-next-contents.txt diff1 | | blob | history
arch/arm/boot/dts/Makefile diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules