summary refs log tree commit diff stats
path: root/include/qemu/compiler.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-04-13 17:08:13 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-04-13 17:08:13 +0100
commit1b665153341613bd2a6074f26d705237eb497d79 (patch)
tree6b059840b4f78681e0381081b46b9804bed8af14 /include/qemu/compiler.h
parent2935f6f2c15386eeb0e3da2391c9ad0bb678ec1e (diff)
parent2d18b4ca023ca1a3aee18064251d6e6e1084f3eb (diff)
downloadfocaccia-qemu-1b665153341613bd2a6074f26d705237eb497d79.tar.gz
focaccia-qemu-1b665153341613bd2a6074f26d705237eb497d79.zip
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210413' into staging
target-arm queue:
 * Fix MPC setting for AN524 SRAM block
 * sphinx: qapidoc: Wrap "If" section body in a paragraph node

# gpg: Signature made Tue 13 Apr 2021 13:07:12 BST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20210413:
  sphinx: qapidoc: Wrap "If" section body in a paragraph node
  hw/arm/mps2-tz: Assert if more than one RAM is attached to an MPC
  hw/arm/mps2-tz: Fix MPC setting for AN524 SRAM block

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