diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-22 11:37:49 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-22 11:37:49 +0000 |
| commit | 6df555170437e28fe89aa11f3b0613026c41d1f9 (patch) | |
| tree | 69700ee41e55de9b080490e709b1134116a75097 /hw/ide/sii3112.c | |
| parent | f7c6b96c3e639e871bb929038a1b82ded7f39437 (diff) | |
| parent | 6f49ec4034e55dfb675a56a62c9579384f7fb8cc (diff) | |
| download | qemu-6df555170437e28fe89aa11f3b0613026c41d1f9.zip qemu-6df555170437e28fe89aa11f3b0613026c41d1f9.tar.gz qemu-6df555170437e28fe89aa11f3b0613026c41d1f9.tar.bz2 | |
Merge remote-tracking branch 'remotes/elmarco/tags/dump-pull-request' into staging
# gpg: Signature made Sat 20 Jan 2018 20:03:47 GMT
# gpg: using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/dump-pull-request:
dump-guest-memory.py: fix python 2 support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/sii3112.c')
0 files changed, 0 insertions, 0 deletions