Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 14:45:43 +0000 (07:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 14:45:43 +0000 (07:45 -0700)
commit768b56f598694ed7215723d402ca3b388106b042
tree9049ed79b7c3447c770de75b4e723e4754d62fd8
parentddf28352b80c86754a6424e3a61e8bdf9213b3c7
parent3b217116edaac634bf31e85c35708298059a8171
Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm

* 'kvm-updates/3.1' of git://github.com/avikivity/kvm:
  KVM: Fix instruction size issue in pvclock scaling