git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Kevin Hilman <khilman@linaro.org>
	Thu, 11 Jun 2015 21:37:45 +0000 (14:37 -0700)
committer	Kevin Hilman <khilman@linaro.org>
	Thu, 11 Jun 2015 21:37:45 +0000 (14:37 -0700)
commit	02719191ee01d840ca28c34294341624f7fed9d6
tree	0528ddc7e2b34046b3bd98dedf89ca7fee40c1ae	tree \| snapshot
parent	6afc362601910641d9c745f52be66b60b7c011d1	commit \| diff
parent	0afb5eefb4ecea4b42269b2698a33a7b99f5324e	commit \| diff

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.

Linux Kernel Source Tree.

RSS Atom

arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-375.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-38x.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-39x.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/exynos4412-trats2.dts	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/arm/juno-motherboard.dtsi	diff1 \|	diff2 \|	blob \| history