commit 7f54492fbca0074d7db117d7972a80347e0b40a5
author Linus Torvalds <torvalds@linux-foundation.org> Mon Dec 26 13:17:00 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Dec 26 13:17:00 2011 -0800
tree a42f39bbcc84af8f13c2fd46502324741536657d
parent 6fd8fb7f55cb6d45e7f078cd0eaf7e3c243f6c33
parent fae9dbb4b462d2c908186a47464c7a5299ee27a9

Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PPC: e500: include linux/export.h
  KVM: PPC: fix kvmppc_start_thread() for CONFIG_SMP=N
  KVM: PPC: protect use of kvmppc_h_pr
  KVM: PPC: move compute_tlbie_rb to book3s_64 common header
  KVM: Don't automatically expose the TSC deadline timer in cpuid
  KVM: Device assignment permission checks
  KVM: Remove ability to assign a device without iommu support
  KVM: x86: Prevent starting PIT timers in the absence of irqchip support