]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6317a6 ddca9fb)
Merge remote branch 'stefanha/tracing' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Mar 2011 14:03:55 +0000 (08:03 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Mar 2011 14:03:55 +0000 (08:03 -0600)

Trivial merge
Qemu copy for testing