Merge commit '7c605a23b2c7606f5f06b7d83d8927b1dc111478' into upstream-merge
commit18b82011ea9886ae200ca0ab8a21d08c620a5755
authorAvi Kivity <avi@redhat.com>
Thu, 16 Feb 2012 16:48:33 +0000 (16 18:48 +0200)
committerAvi Kivity <avi@redhat.com>
Thu, 16 Feb 2012 16:48:33 +0000 (16 18:48 +0200)
treec408c2b0135aba51fd21a0a800197f56e860b18d
parent8fa29d5c2443101a4a16701d2d876ffa5c4f8386
parent7c605a23b2c7606f5f06b7d83d8927b1dc111478
Merge commit '7c605a23b2c7606f5f06b7d83d8927b1dc111478' into upstream-merge

* commit '7c605a23b2c7606f5f06b7d83d8927b1dc111478': (28 commits)
  xhci: handle USB_RET_NAK
  xhci: remote wakeup support
  xhci: kill port arg from xhci_setup_packet
  xhci: stop on errors
  xhci: add trb type name lookup support.
  xhci: signal low- and fullspeed support
  usb: add USBBusOps->wakeup_endpoint
  usb: pass USBEndpoint to usb_wakeup
  usb: maintain async packet list per endpoint
  usb: Set USBEndpoint in usb_packet_setup().
  usb: add USBEndpoint->{nr,pid}
  usb: USBPacket: add status, rename owner -> ep
  usb: fold usb_generic_handle_packet into usb_handle_packet
  usb: kill handle_packet callback
  usb-xhci: switch to usb_find_device()
  usb-musb: switch to usb_find_device()
  usb-ohci: switch to usb_find_device()
  usb-ehci: switch to usb_find_device()
  usb-uhci: switch to usb_find_device()
  usb: handle dev == NULL in usb_handle_packet()
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>
18 files changed:
configure
hw/usb-audio.c
hw/usb-bt.c
hw/usb-bus.c
hw/usb-ccid.c
hw/usb-ehci.c
hw/usb-hid.c
hw/usb-hub.c
hw/usb-msd.c
hw/usb-net.c
hw/usb-ohci.c
hw/usb-serial.c
hw/usb-uhci.c
hw/usb-wacom.c
hw/usb-xhci.c
usb-bsd.c
usb-linux.c
usb-redir.c