summaryrefslogtreecommitdiffstats
path: root/hw/net
diff options
context:
space:
mode:
authorPeter Maydell2014-04-24 17:16:57 +0200
committerPeter Maydell2014-04-24 17:16:57 +0200
commit0e96643c98eb22a5f2e11ac500852133032d38e4 (patch)
treebdc813fc96a2ab61c004696c88f26b755895e99f /hw/net
parentMerge remote-tracking branch 'remotes/rth/tags/tcg-next-20140422' into staging (diff)
parentusb: mtp filesharing (diff)
downloadqemu-0e96643c98eb22a5f2e11ac500852133032d38e4.tar.gz
qemu-0e96643c98eb22a5f2e11ac500852133032d38e4.tar.xz
qemu-0e96643c98eb22a5f2e11ac500852133032d38e4.zip
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>
Diffstat (limited to 'hw/net')
0 files changed, 0 insertions, 0 deletions