| commit | a47e34668046ad2029deb8110c41926af04e4142 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Apr 19 05:20:54 2017 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed Apr 19 05:20:54 2017 -0700 |
| tree | f58db00b703310d966737e758c9a545f5ef62b0f | |
| parent | 3f5099f0c7677d2f1710408530d2d6ab114aad32 [diff] | |
| parent | 6eb0d80d1df364bbb31d869e66063ca239912cbf [diff] |
Merge branch 'sti-dt-for-v4.12-round1' of git://git.kernel.org/pub/scm/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>