From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 29 Feb 2016 12:24:26 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160229-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=071608b519adf62bc29c914343a21c5407ab1ac9;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160229-1' into staging

usb: redirect bugfix, MAINTAINERS update.

# gpg: Signature made Mon 29 Feb 2016 11:09:54 GMT 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-20160229-1:
  usb-redirect: Avoid double free of data
  MAINTAINERS: Add some missing entries for USB related files

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

071608b519adf62bc29c914343a21c5407ab1ac9