Merge branch 'for-upstream-master' of git://github.com/agraf/linux-2.6
authorAvi Kivity <avi@redhat.com>
Wed, 11 Jul 2012 15:49:20 +0000 (18:49 +0300)
committerAvi Kivity <avi@redhat.com>
Wed, 11 Jul 2012 15:49:20 +0000 (18:49 +0300)
commit37e41afa97307a3e54b200a5c9179ada1632a844
tree93057758db5a44bd8268191a829e2e1ce1ed162e
parenta76beb14123a69ca080f5a5425e28b786d62318d
parent1dee7a3dc89fe8c7671aee012be8981a42aad45f
Merge branch 'for-upstream-master' of git://github.com/agraf/linux-2.6

PPC fix from Alex Graf: "It contains an important bug fix which
can lead to guest freezes when using PAPR guests with PR KVM."

* 'for-upstream-master' of git://github.com/agraf/linux-2.6:
  powerpc/kvm: Fix "PR" KVM implementation of H_CEDE

Signed-off-by: Avi Kivity <avi@redhat.com>