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)
* 'kvm-updates/3.1' of git://github.com/avikivity/kvm:
  KVM: Fix instruction size issue in pvclock scaling


Trivial merge