From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 31 Aug 2012 15:04:54 +0000 (-0500)
Subject: Merge remote-tracking branch 'kraxel/usb.61' into staging
X-Git-Tag: v2.7.1~4582
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=23aec6005af30e29180496b434edcc51660ce94e;p=mirror_qemu.git

Merge remote-tracking branch 'kraxel/usb.61' into staging

* kraxel/usb.61:
  uas: move transfer kickoff
  ehci: Fix interrupt endpoints no longer working
  ehci: handle TD deactivation of inflight packets
  ehci: add ehci_cancel_queue()
  ehci: simplify ehci_state_executing
  ehci: Remove unnecessary ehci_flush_qh call
  ehci: Schedule async-bh when IAAD bit gets set
  ehci: Fix NULL ptr deref when unplugging an USB dev with an iso stream active
  usb: unique packet ids
  usb: Halt ep queue en cancel pending packets on a packet error
  fix info qtree indention
---

23aec6005af30e29180496b434edcc51660ce94e