]> git.proxmox.com Git - mirror_qemu.git/commit
projects / mirror_qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7677e24f3db8466c7d6014a794b1e425bc7929ba
tree2231c7456a6c179206b4cf892d8e80c016ff8ba8tree
parent248bfdc9f53a85b82e3ff39c5122d8849f61ee65commit | diff
parent0cdd3d14447da1a04e778c219c77db8b96f9cf33commit | diff
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
QEMU mirror