From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 29 Jan 2014 17:29:01 +0000 (+0100)
Subject: Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue
X-Git-Tag: v3.14-rc1~26^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b73117c49364551ff789db7c424a115ac5b77850;p=pandora-kernel.git

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
---

b73117c49364551ff789db7c424a115ac5b77850
Reading git-diff-tree failed