git-history.diyao.me Git - linux/.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	ecdf94da6f91310d08081e05db78a6c997b44e4b
tree	0528ddc7e2b34046b3bd98dedf89ca7fee40c1ae	tree \| snapshot
parent	e28f23d8aaf3c3455edcdf646d910757051a07e3	commit \| diff
parent	c65b99f046843d2455aa231747b5a07a999a9f3d	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.

https://github.com/torvalds/linux.git

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