summary refs log tree commit diff stats
path: root/scripts/qemu.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-07-29 11:01:38 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-07-29 11:01:38 +0100
commitaa2aac51f0f888b9a4a4fd461d5816ad84a1c448 (patch)
treecace533d438452dc14a833bb32cd827875a2d193 /scripts/qemu.py
parent21a21b853a1bb606358af61e738abfb9aecbd720 (diff)
parent87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f (diff)
downloadfocaccia-qemu-aa2aac51f0f888b9a4a4fd461d5816ad84a1c448.tar.gz
focaccia-qemu-aa2aac51f0f888b9a4a4fd461d5816ad84a1c448.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Thu 28 Jul 2016 23:50:37 BST
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  ide: fix halted IO segfault at reset

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