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

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

Merge branch 'next/late' into for-next

Conflicts:
arch/arm/mach-shmobile/setup-r8a7778.c

Linux kernel for KaRo TX COM modules

arch/arm/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/exynos5250.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/uncompress.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-exynos5-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/platsmp.c	diff1 \|	diff2 \|	blob \| history