Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181203-pull-request...
commit933cc4bb3469b82be2a2095523df400973aa4790
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 3 Dec 2018 19:57:59 +0000 (3 19:57 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 3 Dec 2018 19:57:59 +0000 (3 19:57 +0000)
treee1f1d6ea088e8b7a6b5a7799441c71e3fd19addf
parent9225cd127dd885112787d0dafd7d8aea71e223b4
parentc52d46e041b42bb1ee6f692e00a0abe37a9659f6
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181203-pull-request' into staging

usb: mtp fixes.

# gpg: Signature made Mon 03 Dec 2018 19:50:26 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/fixes-31-20181203-pull-request:
  usb-mtp: outlaw slashes in filenames
  usb-mtp: fix utf16_to_str

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