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)
commit32e0e382ee51f34e9c42b3c69a1fd474bcfd449c
tree30bae531973a53c8f147a10b9c4ccc7767d866ea
parent6cea28d01ee834c4437cccab07f3086435de08a4
parentb6ac069532218027f2991cba01d7a72a200688b0
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

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