git.cascardo.info Git - cascardo/linux.git/commit

Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue

Conflicts:
arch/powerpc/include/asm/processor.h

Unnamed repository; edit this file 'description' to name the repository.

Documentation/virtual/kvm/api.txt	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv_rmhandlers.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/e500_mmu_host.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
include/linux/kvm_host.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/kvm.h	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	diff1 \|	diff2 \|	blob \| history