projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad600a4 840a178)
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-5' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 24 Apr 2014 15:16:57 +0000 (16:16 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 24 Apr 2014 15:16:57 +0000 (16:16 +0100)
usb: mtp filesharing

# gpg: Signature made Wed 23 Apr 2014 09:28:37 BST 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-5:
  usb: mtp filesharing
  usb: add CompatibleID support to msos

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.