Merge tag 'v4.1-rc6' into next/dt

Linux 4.1-rc6

 Conflicts:
	arch/arm/boot/dts/zynq-7000.dtsi

Resolution summary:

 Mainline had an earlier version of the commit, resolve in favor of the
 newer patch in next/dt branch.

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/armada-375.dtsi
Simple merge

diff --cc arch/arm/boot/dts/armada-38x.dtsi
Simple merge

diff --cc arch/arm/boot/dts/armada-39x.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos4412-trats2.dts
Simple merge

diff --cc arch/arm64/boot/dts/arm/juno-motherboard.dtsi
Simple merge