projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita47e34668046ad2029deb8110c41926af04e4142
treef58db00b703310d966737e758c9a545f5ef62b0ftree | snapshot
parent3f5099f0c7677d2f1710408530d2d6ab114aad32commit | diff
parent6eb0d80d1df364bbb31d869e66063ca239912cbfcommit | diff
Merge branch 'sti-dt-for-v4.12-round1' of git://git./linux/kernel/git/pchotard/sti into next/dt

* '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>
John Crispins staging tree