git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 77f01bd 4068890)

author	Paolo Bonzini <pbonzini@redhat.com>
	Wed, 29 Jan 2014 17:29:01 +0000 (18:29 +0100)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Wed, 29 Jan 2014 17:29:01 +0000 (18:29 +0100)
commit	b73117c49364551ff789db7c424a115ac5b77850
tree	e151d34e68ef6061f1ac10f5db0aff262dc3aff5	tree
parent	77f01bdfa5e55dc19d3eb747181d2730a9bb3ca8	commit \| diff
parent	4068890931f62752abc3591e7b3736e7537c6dcb	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/kvm_book3s.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/kvm_book3s_asm.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/reg.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/switch_to.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_64_mmu_hv.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv_rm_mmu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv_rmhandlers.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_pr.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_rmhandlers.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/booke.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository