git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c72385f d2ab9e8)

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	245111e6fb26cc1141693ccb3d3053c44c091c07
tree	e151d34e68ef6061f1ac10f5db0aff262dc3aff5	tree \| snapshot
parent	c72385f575e43ca7da745fcdaf518e06ae748e32	commit \| diff
parent	d2ab9e856920b171279879d9b391ef9d9c400404	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

Linux Kernel Source Tree.