From: Peter Maydell Date: Mon, 3 Dec 2018 19:57:59 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181203-pull-request... X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=933cc4bb3469b82be2a2095523df400973aa4790;p=people%2Fpauldu%2Fqemu.git 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # 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 --- 933cc4bb3469b82be2a2095523df400973aa4790