Merge branch 'next/kvm' into mips-for-linux-next

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/include/asm/mmu_context.h
Simple merge

diff --cc arch/mips/kernel/traps.c
Simple merge

diff --cc arch/mips/mm/c-r4k.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge