From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 15 Aug 2012 16:15:02 +0000 (-0500)
Subject: Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cc92186773df8c9aae8f812fff85e7325e1d7583;p=qmiga%2Fqemu.git

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
  update-linux-headers.sh: Pull in asm-generic/kvm_para.h
  kvmvapic: Disable if there is insufficient memory
  kvm: i8254: Finish time conversion fix
  kvm: i8254: Cache kernel clock offset in KVMPITState
---

cc92186773df8c9aae8f812fff85e7325e1d7583