Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Jun 2012 12:46:59 +0000 (15:46 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Jun 2012 12:46:59 +0000 (15:46 +0300)
Pull kvm fix from Marcelo Tosatti:
 "Fix a spurious warning on CPU offline path"

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  x86: kvmclock: remove check_and_clear_guest_paused warning


Trivial merge