]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:10:51 +0000 (12:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:15:48 +0000 (12:15 +1100)
commit975c9c5bf0d08521fa651b14efa39c276e5ed0fc
treef866985eecfecfa36fdc1a4589b8213289cfed5e
parenta31254ab6c803d7852455ec95a8bcda274741dc4
parent2c4eb8bd98d64fe519b64448075e53b00c118ab2
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
13 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/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
arch/powerpc/sysdev/fsl_msi.c
drivers/tty/Kconfig
include/linux/kvm_host.h