summary refs log tree commit diff stats
path: root/hw/net/vmxnet_debug.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-01-08 11:24:15 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-01-08 11:24:15 +0000
commit9df2513730c5902813f575a74ac9303388fd029d (patch)
tree1a89eddbe1d9e368a0a8e004ceaec734dc32a56c /hw/net/vmxnet_debug.h
parentd9767f1bfa1f21f23e51403697be55d5c6280d94 (diff)
parent087462c7739869e9b888c06c06c8f1bbfd99779c (diff)
downloadfocaccia-qemu-9df2513730c5902813f575a74ac9303388fd029d.tar.gz
focaccia-qemu-9df2513730c5902813f575a74ac9303388fd029d.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160108-1' into staging
usb: mtp and ohci fixes.

# gpg: Signature made Fri 08 Jan 2016 10:14:59 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20160108-1:
  ohci: clear pending SOF on suspend
  ohci: delay first SOF interrupt
  usb-mtp: fix call to trace function
  usb-mtp: use safe variant when cleaning events list
  ohci: fix command HostControllerReset
  ohci: fix Host Controller USBRESET
  ohci: split reset method in 3 parts

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/vmxnet_debug.h')
0 files changed, 0 insertions, 0 deletions