diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-12-22 00:11:36 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-12-22 00:11:36 +0000 |
| commit | 281f327487c9c9b1599f93c589a408bbf4a651b8 (patch) | |
| tree | 118c1f7771a424841bcb921148c9b76b696eb82a /block.c | |
| parent | 43ab9a5376c95c61ae898a222c4d04bdf60e239b (diff) | |
| parent | 598a29f3606c4c7042a1ca3f1116663d0a60867c (diff) | |
| download | qemu-281f327487c9c9b1599f93c589a408bbf4a651b8.tar.gz | |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging
# gpg: Signature made Thu 21 Dec 2017 19:35:00 GMT
# gpg: using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier/tags/m68k-for-2.12-pull-request:
tests/boot-serial-test: Add support for the mcf5208evb board
target/m68k: fix set_cc_op()
target/m68k: add monitor.c
target/m68k: remove unused variable gen_throws_exception
Split adb.c into adb.c, adb-mouse.c and adb-kbd.c
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block.c')
0 files changed, 0 insertions, 0 deletions