From: Avi Kivity <avi@redhat.com>
Date: Thu, 14 Oct 2010 16:06:26 +0000 (+0200)
Subject: Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cec8b6b972a572b69d4902f57fb659e8a4c749af;p=users%2Fdwmw2%2Flinux.git

Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into next

* 'kvm-ppc-next' of git://github.com/agraf/linux-2.6:
  KVM: PPC: e500: Call kvm_vcpu_uninit() before kvmppc_e500_tlb_uninit().
  KVM: PPC: BookE: fix sleep with interrupts disabled
  KVM: PPC: BookE: Load the lower half of MSR

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

cec8b6b972a572b69d4902f57fb659e8a4c749af