]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ffcb2c 39fba3a)
Merge remote-tracking branch 'kraxel/usb.29' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 18:09:31 +0000 (13:09 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 18:09:31 +0000 (13:09 -0500)

Trivial merge
Qemu copy for testing