From: Olof Johansson Date: Wed, 19 Apr 2017 12:20:54 +0000 (-0700) Subject: Merge branch 'sti-dt-for-v4.12-round1' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a47e34668046ad2029deb8110c41926af04e4142;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- a47e34668046ad2029deb8110c41926af04e4142