git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a4ecd62 191825c)

author	Jason Cooper <jason@lakedaemon.net>
	Mon, 5 May 2014 01:28:20 +0000 (01:28 +0000)
committer	Jason Cooper <jason@lakedaemon.net>
	Mon, 5 May 2014 01:28:20 +0000 (01:28 +0000)
commit	9dad42f58025c4dced7378d88bdeb76744edd5bc
tree	c4853c0711a99088512815ac07fab07845d83794	tree \| snapshot
parent	a4ecd62dc1d0c12c6c6962c4b0550dfa24d02a3a	commit \| diff
parent	191825c38eafeda033a73338f5a710fa6fd5b3d6	commit \| diff

Merge branch 'mvebu/dt' into for-next

Conflicts:
arch/arm/boot/dts/kirkwood-t5325.dts

18 files changed:

arch/arm/boot/dts/armada-370-db.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-370-xp.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-375-db.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-38x.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-xp-db.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-xp-gp.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-b3.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-cloudbox.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-dreamplug.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-laplug.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-ns2-common.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-nsa310.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-nsa310a.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-openblocks_a6.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-openblocks_a7.dts	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules