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/mach-omap2/cclock33xx_data.c

Linux kernel for KaRo TX COM modules

arch/arm/arm-soc-for-next-contents.txt	diff1 \|	\|	blob \| history
arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/am33xx.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/omap3430-sdp.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/cclock33xx_data.c	diff1 \|	diff2 \|	blob \| history