]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36520fa 2b29f49)
Merge remote-tracking branch 'kraxel/usb.73' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 30 Nov 2012 16:20:21 +0000 (10:20 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 30 Nov 2012 16:20:21 +0000 (10:20 -0600)
* kraxel/usb.73:
  ehci-sysbus: Attach DMA context.
  usb: fail usbdevice_create() when there is no USB bus
  usb: tag usb host adapters as not hotpluggable.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge
Qemu copy for testing