Merge branch 'usb.64' of git://git.kraxel.org/qemu