summary refs log tree commit diff stats
path: root/include/hw/timer/imx_gpt.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-09-08 17:23:31 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-09-08 17:23:31 +0100
commit6779038537360e957dbded830f76b08ef5070161 (patch)
tree41eadd73f2f30a9993b8306e92433bcb9bd11334 /include/hw/timer/imx_gpt.h
parentb95ba83fc56ebfc4b6869f21db0c757c0c191104 (diff)
parent6b306786cafd6ff939f1c831f0065c136105dca7 (diff)
downloadfocaccia-qemu-6779038537360e957dbded830f76b08ef5070161.tar.gz
focaccia-qemu-6779038537360e957dbded830f76b08ef5070161.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-09-08' into staging
QAPI patches patches for 2020-09-08

# gpg: Signature made Tue 08 Sep 2020 07:06:52 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2020-09-08:
  qapi/block-core.json: Fix nbd-server-start docs
  qapi: Fix indentation, again
  qapi/migration.json: Fix indentation
  qapi: Make section headings start a new doc comment block
  qapi: Reject section markup in definition documentation

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/timer/imx_gpt.h')
0 files changed, 0 insertions, 0 deletions