diff options
| author | Peter Maydell | 2019-07-11 12:58:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-11 12:58:14 +0200 |
| commit | 9411db8f37c64b9adb3e4b393c623a5760bcb847 (patch) | |
| tree | 2aecb86acc40515e47d525425de900a79c1046cb /hw/timer/hpet.c | |
| parent | Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-gdbstub-1... (diff) | |
| parent | docs/bitmaps: use QMP lexer instead of json (diff) | |
| download | qemu-9411db8f37c64b9adb3e4b393c623a5760bcb847.tar.gz qemu-9411db8f37c64b9adb3e4b393c623a5760bcb847.tar.xz qemu-9411db8f37c64b9adb3e4b393c623a5760bcb847.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging
Pull request
# gpg: Signature made Wed 10 Jul 2019 20:21:58 BST
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# 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/bitmaps-pull-request:
docs/bitmaps: use QMP lexer instead of json
sphinx: add qmp_lexer
docs/interop/bitmaps.rst: Fix typos
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/hpet.c')
0 files changed, 0 insertions, 0 deletions