]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 02:39:59 +0000 (13:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Oct 2012 02:40:03 +0000 (13:40 +1100)
commit03a89d9cf6d02d47e8726ad11cf7b55062396345
tree1b8d9f229c4a9ff62c70bc60bd0099c28c5f0a21
parente4ef31aae5e9c74bceabd1eddbd57ee9edc70cba
parent03604b31142058362db13e7881385806977893f5
Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
12 files changed:
arch/powerpc/include/asm/kvm_book3s.h
arch/powerpc/include/asm/kvm_para.h
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/uapi/asm/epapr_hcalls.h
arch/powerpc/include/uapi/asm/kvm.h
arch/powerpc/include/uapi/asm/kvm_para.h
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kvm/book3s_32_mmu_host.c
arch/powerpc/kvm/book3s_64_mmu_host.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/trace.h
include/uapi/linux/kvm.h