aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-02-02 09:53:15 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-02-02 09:53:15 +0000
commit707eafb8b082b45504e95c1705816fc190e23247 (patch)
treefb7e6eecf74087e5d53f36a13efda624384f9489 /hw
parentb05631954d6dfe93340d516660397e2c1a2a5dd6 (diff)
parent45a79646ea746fa3f32083d0aa70512aae29f6b3 (diff)
downloadqemu-707eafb8b082b45504e95c1705816fc190e23247.zip
qemu-707eafb8b082b45504e95c1705816fc190e23247.tar.gz
qemu-707eafb8b082b45504e95c1705816fc190e23247.tar.bz2
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Thu 01 Feb 2018 04:05:22 GMT # 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: iotests: Make 200 run on tmpfs block/ssh: fix possible segmentation fault when .desc is not null-terminated Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions