]> git.proxmox.com Git - mirror_qemu.git/commit
projects / mirror_qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0e96643c98eb22a5f2e11ac500852133032d38e4
treebdc813fc96a2ab61c004696c88f26b755895e99ftree
parentad600a4d49293f6b8eda7932f90e5aa5fa2021b0commit | diff
parent840a178c94dbd3f5b5550fb8621620cb761de72dcommit | diff
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-5' into staging

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>
QEMU mirror