diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-24 16:16:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-24 16:16:57 +0100 |
| commit | 0e96643c98eb22a5f2e11ac500852133032d38e4 (patch) | |
| tree | bdc813fc96a2ab61c004696c88f26b755895e99f /balloon.c | |
| parent | ad600a4d49293f6b8eda7932f90e5aa5fa2021b0 (diff) | |
| parent | 840a178c94dbd3f5b5550fb8621620cb761de72d (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>
Diffstat (limited to 'balloon.c')
0 files changed, 0 insertions, 0 deletions