From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Oct 2013 17:25:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v3.12-rc4~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77c4ad8e231ae8b31cbde28f1e4a2c00df3bc238;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull two KVM fixes from Gleb Natapov.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: VMX: do not check bit 12 of EPT violation exit qualification when undefined
  ARM: kvm: rename cpu_reset to avoid name clash
---

77c4ad8e231ae8b31cbde28f1e4a2c00df3bc238