Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Nov 2012 00:49:10 +0000 (16:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Nov 2012 00:49:10 +0000 (16:49 -0800)
Pull KVM fix from Marcelo Tosatti:
 "A correction for oops on module init with older Intel hosts."

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Fix invalid secondary exec controls in vmx_cpuid_update()


Trivial merge