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

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

Merge branch 'next/dt' into for-next

Conflicts:
arch/arm/boot/dts/snowball.dts

Linux kernel for KaRo TX COM modules

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/arm-soc-for-next-contents.txt	diff1 \|	\|	blob \| history
arch/arm/boot/dts/at91sam9x5.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dbx5x0.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/href.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/snowball.dts	diff1 \|	diff2 \|	blob \| history