From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 24 Apr 2014 15:16:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-5' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0e96643c98eb22a5f2e11ac500852133032d38e4;p=qemu.git

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

0e96643c98eb22a5f2e11ac500852133032d38e4