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

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

author	Jason Cooper <jason@lakedaemon.net>
	Sun, 25 May 2014 17:20:20 +0000 (17:20 +0000)
committer	Jason Cooper <jason@lakedaemon.net>
	Sun, 25 May 2014 17:20:20 +0000 (17:20 +0000)
commit	0a847a5b6ebe8e39b926b3f891623df66ce44d0f
tree	e9b4e1049580cc999830ebd5b4a47f479a26adc7	tree \| snapshot
parent	6d01c64505b79cd1cd59df07a118dc569c086b04	commit \| diff
parent	54aab8845c46b0f87947107cdc67c8ed7062a5bb	commit \| diff

Merge branch 'mvebu/dt' into mvebu/for-next

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

21 files changed:

arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
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-380.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-385.dtsi	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

arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
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-380.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/armada-385.dtsi	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