Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 29 Jan 2014 17:29:01 +0000 (18:29 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 29 Jan 2014 17:29:01 +0000 (18:29 +0100)
commitb73117c49364551ff789db7c424a115ac5b77850
treee151d34e68ef6061f1ac10f5db0aff262dc3aff5
parent77f01bdfa5e55dc19d3eb747181d2730a9bb3ca8
parent4068890931f62752abc3591e7b3736e7537c6dcb
Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue

Conflicts:
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/booke.c
14 files changed:
Documentation/virtual/kvm/api.txt
arch/powerpc/Kconfig
arch/powerpc/include/asm/kvm_book3s.h
arch/powerpc/include/asm/kvm_book3s_asm.h
arch/powerpc/include/asm/reg.h
arch/powerpc/include/asm/switch_to.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kvm/book3s_64_mmu_hv.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rm_mmu.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/book3s_pr.c
arch/powerpc/kvm/book3s_rmhandlers.S
arch/powerpc/kvm/booke.c