Merge branch 'next/kvm' into mips-for-linux-next
Ralf Baechle [Thu, 9 May 2013 15:56:40 +0000 (17:56 +0200)]
1  2 
arch/mips/Kconfig
arch/mips/include/asm/mmu_context.h
arch/mips/kernel/traps.c
arch/mips/mm/c-r4k.c
virt/kvm/kvm_main.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge