]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1571b6c 0cd0fd0)
Merge remote-tracking branch 'kraxel/usb.31' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 21 Nov 2011 20:44:04 +0000 (14:44 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 21 Nov 2011 20:44:04 +0000 (14:44 -0600)

Trivial merge
Qemu copy for testing