Merge tag 'v4.1-rc6' into next/dt
authorKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 21:37:45 +0000 (14:37 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 21:37:45 +0000 (14:37 -0700)
commitecdf94da6f91310d08081e05db78a6c997b44e4b
tree0528ddc7e2b34046b3bd98dedf89ca7fee40c1ae
parente28f23d8aaf3c3455edcdf646d910757051a07e3
parentc65b99f046843d2455aa231747b5a07a999a9f3d
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.
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/armada-375.dtsi
arch/arm/boot/dts/armada-38x.dtsi
arch/arm/boot/dts/armada-39x.dtsi
arch/arm/boot/dts/exynos4412-trats2.dts
arch/arm64/boot/dts/arm/juno-motherboard.dtsi