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: aadd78f 6bd9848)

author	Jason Cooper <jason@lakedaemon.net>
	Thu, 13 Jun 2013 18:03:38 +0000 (18:03 +0000)
committer	Jason Cooper <jason@lakedaemon.net>
	Thu, 13 Jun 2013 18:03:38 +0000 (18:03 +0000)
commit	b8bc6a47378009da438cc7dd831bf5c15b579888
tree	f1c67d85c1ddc1f9aaf717003a46b6cc9d10203f	tree \| snapshot
parent	aadd78fefaa3b01f64b6e4eb8e5a2207692094df	commit \| diff
parent	6bd98481ab346964344e05a041f35ff83cb3d00c	commit \| diff

Merge branch 'mvebu/pcie_kirkwood' into for-next

Conflicts:
arch/arm/boot/dts/kirkwood-6281.dtsi
arch/arm/mach-kirkwood/board-ts219.c

17 files changed:

arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-6281.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-6282.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-iconnect.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-mplcec4.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-nsa310.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-ts219-6281.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-ts219-6282.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood-ts219.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/kirkwood.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/board-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-kirkwood/common.h	diff1 \|	diff2 \|	blob \| history
drivers/pci/host/pci-mvebu.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules