]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'kraxel/usb.21' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 14:23:49 +0000 (09:23 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 14:23:49 +0000 (09:23 -0500)

Trivial merge