From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Dec 2011 21:17:00 +0000 (-0800)
Subject: Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: firefly_0821_release~3680^2~3885
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f54492fbca0074d7db117d7972a80347e0b40a5;p=firefly-linux-kernel-4.4.55.git

Merge branch 'kvm-updates/3.2' of git://git./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
---

7f54492fbca0074d7db117d7972a80347e0b40a5