From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 11 Jul 2019 10:58:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9411db8f37c64b9adb3e4b393c623a5760bcb847;p=qemu.git

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>
---

9411db8f37c64b9adb3e4b393c623a5760bcb847