diff options
| author | Peter Maydell | 2016-07-29 12:01:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-29 12:01:38 +0200 |
| commit | aa2aac51f0f888b9a4a4fd461d5816ad84a1c448 (patch) | |
| tree | cace533d438452dc14a833bb32cd827875a2d193 /qapi-schema.json | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into st... (diff) | |
| parent | ide: fix halted IO segfault at reset (diff) | |
| download | qemu-aa2aac51f0f888b9a4a4fd461d5816ad84a1c448.tar.gz qemu-aa2aac51f0f888b9a4a4fd461d5816ad84a1c448.tar.xz 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 'qapi-schema.json')
0 files changed, 0 insertions, 0 deletions