]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c4dd42 f3aaaa2)
Merge remote-tracking branch 'kraxel/usb.23' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Aug 2011 12:50:35 +0000 (07:50 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Aug 2011 12:50:35 +0000 (07:50 -0500)

Trivial merge
Qemu copy for testing