]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'next/kvm' into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Thu, 9 May 2013 15:56:40 +0000 (17:56 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 9 May 2013 15:56:40 +0000 (17:56 +0200)
commit5e0e61dd2c89c673f89fb57dcd3cc746dc0c1706
tree5ebe6156cbc8620625b736a5c9f4d3f47e6d9ebc
parent9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7
parent50c8308538dc9671490d6cb65259ef0ed79f5d13
Merge branch 'next/kvm' into mips-for-linux-next
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