]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f5099f 6eb0d80)
Merge branch 'sti-dt-for-v4.12-round1' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 12:20:54 +0000 (05:20 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 12:20:54 +0000 (05:20 -0700)
* 'sti-dt-for-v4.12-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: STiH407-family: update rproc node names to avoid conflict
  ARM: dts: STiH407-family: fix spi nodes

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge
Linux kernel for KaRo TX COM modules