From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Nov 2011 22:57:43 +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~4073
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a4cc3889f7e2c3f2fd15b492822c889fed5e1800;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 guest: prevent tracing recursion with kvmclock
  Revert "KVM: PPC: Add support for explicit HIOR setting"
  KVM: VMX: Check for automatic switch msr table overflow
  KVM: VMX: Add support for guest/host-only profiling
  KVM: VMX: add support for switching of PERF_GLOBAL_CTRL
  KVM: s390: announce SYNC_MMU
  KVM: s390: Fix tprot locking
  KVM: s390: handle SIGP sense running intercepts
  KVM: s390: Fix RUNNING flag misinterpretation
---

a4cc3889f7e2c3f2fd15b492822c889fed5e1800