Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jun 2012 18:02:09 +0000 (11:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jun 2012 18:02:09 +0000 (11:02 -0700)
Pull KVM fixes from Avi Kivity:
 "Fixing a scheduling-while-atomic bug in the ppc code, and a bug which
  allowed pci bridges to be assigned to guests."

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PPC: Book3S HV: Drop locks around call to kvmppc_pin_guest_page
  KVM: Fix PCI header check on device assignment


Trivial merge