summary refs log tree commit diff stats
path: root/hw/intc/xilinx_intc.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-07-20 20:31:31 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-07-20 20:31:31 +0100
commit6a426eb27ec17684808ab87374f51d6ed3a47835 (patch)
tree1e9db65c886b829f406df6ab14359b5043e132b6 /hw/intc/xilinx_intc.c
parent518cb31fa7d2dd648bc400d68c25e0df8394683f (diff)
parent87ae924b73cbbe13ad800ab2016d011b42456f25 (diff)
downloadfocaccia-qemu-6a426eb27ec17684808ab87374f51d6ed3a47835.tar.gz
focaccia-qemu-6a426eb27ec17684808ab87374f51d6ed3a47835.zip
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>
Diffstat (limited to 'hw/intc/xilinx_intc.c')
0 files changed, 0 insertions, 0 deletions