Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140711-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 11 Jul 2014 15:01:38 +0000 (16:01 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 11 Jul 2014 15:01:38 +0000 (16:01 +0100)
commitaee230d707155a957c8300ee12049377d3ffebef
treec8af3afeed7adc2b51eb6f0c52efc1bd2fdb1f1d
parent42ca32f776c364c6a4c10d7100505b00b7a7f14e
parent13d54125a3482a5837682499d25f6be10aa824be
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140711-1' into staging

mtp: linux guest detection fix

# gpg: Signature made Fri 11 Jul 2014 11:32:20 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-20140711-1:
  mtp: linux guest detection fix.

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