From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 20 Jul 2016 19:31:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160720-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6a426eb27ec17684808ab87374f51d6ed3a47835;p=qemu.git

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

usb: xhci assert fix, add usbredir streams property

# gpg: Signature made Wed 20 Jul 2016 12:32:09 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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/pull-usb-20160720-1:
  usbredir: add streams property
  xhci: Fix possible side effect from assert()

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

6a426eb27ec17684808ab87374f51d6ed3a47835