]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'aneesh/for-upstream-6' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 20 Oct 2011 13:42:08 +0000 (08:42 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 20 Oct 2011 13:42:08 +0000 (08:42 -0500)
commit1f99b94932fcf0a543e46e24875fc2b3a8c304a7
treedeec2cb0dbebe1e6295b7068c85cdf181a378599
parent8a9236f1d2e91ddd31e3eeae8fe27392c07324a9
parentd9b36a6e562450fd633ea9352f43885b86693838
Merge remote-tracking branch 'aneesh/for-upstream-6' into staging

Conflicts:
trace-events
Makefile.objs
qemu-options.hx
trace-events
vl.c