From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 17 Dec 2015 10:26:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20151215-1' into staging
X-Git-Tag: v2.6.0-rc0~263
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc337c6e26abe6b9fb4ec654e9d19e123645a198;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20151215-1' into staging

usb: ehci idt fix, event support for mtp

# gpg: Signature made Tue 15 Dec 2015 09:54:22 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-20151215-1:
  ehci: make idt processing more robust
  usb-mtp: add support for basic mtp events
  usb-mtp: Add support for inotify based file monitoring
  usb-mtp: free objects on a mtp reset
  usb-mtp: use a list for keeping track of children

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

dc337c6e26abe6b9fb4ec654e9d19e123645a198