From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jun 2015 06:54:47 +0000 (-1000)
Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: firefly_0821_release~176^2~1646
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=32e0e382ee51f34e9c42b3c69a1fd474bcfd449c;p=firefly-linux-kernel-4.4.55.git

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

32e0e382ee51f34e9c42b3c69a1fd474bcfd449c