tree e151d34e68ef6061f1ac10f5db0aff262dc3aff5
parent 77f01bdfa5e55dc19d3eb747181d2730a9bb3ca8
parent 4068890931f62752abc3591e7b3736e7537c6dcb
author Paolo Bonzini <pbonzini@redhat.com> 1391016541 +0100
committer Paolo Bonzini <pbonzini@redhat.com> 1391016541 +0100

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