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

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

Merge branch 'next/driver' into for-next

Conflicts:
arch/arm/mach-mx5/Kconfig

Linux kernel for KaRo TX COM modules

arch/arm/mach-at91/at91sam9g45.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/board-mx53_ard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/clock-mx51-mx53.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/devices-imx51.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mx5/mx51_efika.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/devices/Kconfig	diff1 \|	diff2 \|	blob \| history