]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfee021 77fa9ae)
Merge remote-tracking branch 'kraxel/usb.54' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Jun 2012 20:01:47 +0000 (15:01 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Jun 2012 20:01:47 +0000 (15:01 -0500)
* kraxel/usb.54:
  uhci: fix uhci_async_cancel_all
  usb-host: live migration support
  usb-host: attach only to running guest
  ehci: tracing improvements
  usb: restore USBDevice->attached on vmload
  ehci: add live migration support


Trivial merge
Qemu copy for testing