From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 11 Jun 2012 17:15:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7677e24f3db8466c7d6014a794b1e425bc7929ba;p=qemu.git

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

* qemu-kvm/uq/master:
  kvm: i8254: Fix conversion of in-kernel to userspace state
  kvm/apic: correct short memset
---

7677e24f3db8466c7d6014a794b1e425bc7929ba