Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Oct 2013 17:25:10 +0000 (10:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Oct 2013 17:25:10 +0000 (10:25 -0700)
commit77c4ad8e231ae8b31cbde28f1e4a2c00df3bc238
tree621745cec6170809cc94fe639665e6050b3050ac
parentf927318840745095cc7003f1564ca4b87655745d
parentbcd1c2949501869631b25fd62d8df5079677a101
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