Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2016 23:58:14 +0000 (15:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2016 23:58:14 +0000 (15:58 -0800)
commit516c50cde604e93f094bb4c42a2cf81411c7a78d
tree06496f37f8db43cb3e7ec2ee5c6606b211b85854
parent496b0b57c00f2193f2902dd70b219df5a4dfce94
parente5e57e7a03b1cdcb98e4aed135def2a08cbf3257
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