]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 248bfdc 0cdd3d1)
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Jun 2012 17:15:52 +0000 (12:15 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Jun 2012 17:15:52 +0000 (12:15 -0500)
* qemu-kvm/uq/master:
  kvm: i8254: Fix conversion of in-kernel to userspace state
  kvm/apic: correct short memset


Trivial merge
Qemu copy for testing