]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a2ba23 a5c062e)
Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 Jan 2011 21:16:56 +0000 (15:16 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 24 Jan 2011 21:16:56 +0000 (15:16 -0600)

Trivial merge
Qemu copy for testing