git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

Merge branch 'depends/rmk/for-linus' into next/soc

Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c

Ubuntu Disco kernel mirror for Proxmox VE and PMG

arch/arm/mach-omap2/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-ti8168evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/common.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-dt-tegra20.c	diff1 \|	\|	blob \| history
arch/arm/mach-tegra/board-harmony.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/board-paz00.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/mach-tegra/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/timer.c	diff1 \|	diff2 \|	blob \| history