From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Sep 2011 14:45:43 +0000 (-0700)
Subject: Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm
X-Git-Tag: firefly_0821_release~3680^2~4528
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=768b56f598694ed7215723d402ca3b388106b042;p=firefly-linux-kernel-4.4.55.git

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

768b56f598694ed7215723d402ca3b388106b042