]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'kraxel/usb.28' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 15:46:35 +0000 (10:46 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 14 Oct 2011 15:46:35 +0000 (10:46 -0500)

Trivial merge