summary refs log tree commit diff stats
path: root/hw/misc/mst_fpga.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-04-04 17:48:18 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-04-04 17:48:18 +0100
commitf1a639aaf2748ad3f804c4d862f570ec6473da79 (patch)
tree80af4248e0c1097dc508308db9f5e19716804162 /hw/misc/mst_fpga.c
parent74912f6dad207bfdd5bfa8c6012c364ea9405fc7 (diff)
parentbfb15b4becf2c9cf484bc3bf893a37c8f3c15cb3 (diff)
downloadfocaccia-qemu-f1a639aaf2748ad3f804c4d862f570ec6473da79.tar.gz
focaccia-qemu-f1a639aaf2748ad3f804c4d862f570ec6473da79.zip
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 04 Apr 2018 17:07:57 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  block/rbd: remove processed options from qdict

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/mst_fpga.c')
0 files changed, 0 insertions, 0 deletions