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

author	Jason Cooper <jason@lakedaemon.net>
	Thu, 6 Jun 2013 19:15:07 +0000 (19:15 +0000)
committer	Jason Cooper <jason@lakedaemon.net>
	Thu, 6 Jun 2013 19:15:07 +0000 (19:15 +0000)
commit	15875291b1ef5c99d5c045865f8b5063931efed2
tree	8ebcc6ed5123bcef07ed5afdb7476fac4229d5dc	tree \| snapshot
parent	02554380d6816d216e73c7084963146cf2479ae5	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