]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Oct 2010 16:16:01 +0000 (09:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Oct 2010 16:16:01 +0000 (09:16 -0700)
* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Move TSC reset out of vmcb_init
  KVM: x86: Fix SVM VMCB reset


Trivial merge