summary refs log tree commit diff stats
path: root/hw/usb/dev-mtp.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-03-29 11:51:54 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-03-29 11:51:54 +0000
commitc503849bb5400cc4a7a293603067e8f995e46280 (patch)
tree84dc8013d5705307e1b44206f9c55cc5c1863188 /hw/usb/dev-mtp.c
parent94c01767aa9577aac17f7a68935c7d86a1be69ad (diff)
parentab79237a15e8f8c23310291b672d83374cf17935 (diff)
downloadfocaccia-qemu-c503849bb5400cc4a7a293603067e8f995e46280.tar.gz
focaccia-qemu-c503849bb5400cc4a7a293603067e8f995e46280.zip
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Fri 29 Mar 2019 07:30:26 GMT
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  net: tap: use qemu_set_nonblock
  MAINTAINERS: Update the latest email address
  e1000: Delay flush queue when receive RCTL
  net/socket: learn to talk with a unix dgram socket

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