From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2016 23:58:14 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: firefly_0821_release~176^2~483
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=516c50cde604e93f094bb4c42a2cf81411c7a78d;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for-linus' of git://git./virt/kvm/kvm

Pull KVM fix from Paolo Bonzini:
 "A simple fix.  I'm sending it before the merge window, because it
  refines a patch found in your master branch but not yet in the
  kvm/next branch that is destined for 4.5"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: x86: only channel 0 of the i8254 is linked to the HPET
---

516c50cde604e93f094bb4c42a2cf81411c7a78d