Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvmmaster
commit0acc1b2afb6ded060b7d6b1b5e6ac8a00ec47547
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Oct 2010 16:16:01 +0000 (12 09:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Oct 2010 16:16:01 +0000 (12 09:16 -0700)
tree775942bcb62c49f54d606b9d6d16c4577df607b1
parent7c5347733dcc4ba0bac0baf86d99fae0561f33b7
parent47008cd887c1836bcadda123ba73e1863de7a6c4
Merge branch 'kvm-updates/2.6.36' of git://git./virt/kvm/kvm

* '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