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: d75adbc 599a136)

author	Jason Cooper <jason@lakedaemon.net>
	Fri, 16 May 2014 18:00:50 +0000 (18:00 +0000)
committer	Jason Cooper <jason@lakedaemon.net>
	Fri, 16 May 2014 18:00:50 +0000 (18:00 +0000)
commit	74be6be684a8c5b36665a927cb301ee0b584ecad
tree	61b6cae8cd14cbcd1f3c2320a487909b6b4c13b1	tree \| snapshot
parent	d75adbc9efc0c92064ce4bc7ab96caf37cf270d1	commit \| diff
parent	599a136e5f4a7c3ca324fb2749ca235cd90c9d51	commit \| diff

Merge branch 'mvebu/dt' into for-next

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

19 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-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