]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into next
authorAvi Kivity <avi@redhat.com>
Thu, 14 Oct 2010 16:06:26 +0000 (18:06 +0200)
committerAvi Kivity <avi@redhat.com>
Thu, 14 Oct 2010 16:06:26 +0000 (18:06 +0200)
* '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>

Trivial merge