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

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

Merge branch 'next/board' into for-next

Conflicts:
arch/arm/mach-tegra/board-paz00.c

Linux kernel for KaRo TX COM modules

arch/arm/mach-s3c64xx/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-harmony.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00-pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-seaboard-pinmux.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-seaboard.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-trimslice.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s5p/include/plat/pll.h	diff1 \|	diff2 \|	blob \| history