]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jun 2015 06:54:47 +0000 (20:54 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jun 2015 06:54:47 +0000 (20:54 -1000)
Pull kvm bugfix from Marcelo Tosatti:
 "Rrestore APIC migration functionality"

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: fix lapic.timer_mode on restore


Trivial merge