]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 01:08:13 +0000 (12:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 01:08:17 +0000 (12:08 +1100)
commitc2e44416477f3e5dbfa5efeef77e15a3353aae57
treef1e6757be58934959f463afffaa6d54cdb032876
parent8f7f1c11e0f95ad511f8f957b22fe892c566437a
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