summary refs log tree commit diff stats
path: root/hw/acpi/pcihp.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-04-05 12:43:12 +0100
committerPeter Maydell <peter.maydell@linaro.org>2022-04-05 12:43:12 +0100
commit223a8671cac29f64591a8e01c00d8db45a343d52 (patch)
tree2e786ff9dc8bda07172d98587c27d07818ddb93b /hw/acpi/pcihp.c
parent20661b75ea6093f5e59079d00a778a972d6732c5 (diff)
parent80b952bb694a90f7e530d407b01066894e64a443 (diff)
downloadfocaccia-qemu-223a8671cac29f64591a8e01c00d8db45a343d52.tar.gz
focaccia-qemu-223a8671cac29f64591a8e01c00d8db45a343d52.zip
Merge tag 'pull-target-arm-20220405' of https://git.linaro.org/people/pmaydell/qemu-arm into staging
target-arm queue:
 * docs/system/devices/can.rst: correct links to CTU CAN FD IP core documentation.
 * xlnx-bbram: hw/nvram: Fix uninitialized Error *

# gpg: Signature made Tue 05 Apr 2022 10:26:21 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

* tag 'pull-target-arm-20220405' of https://git.linaro.org/people/pmaydell/qemu-arm:
  docs/system/devices/can.rst: correct links to CTU CAN FD IP core documentation.
  xlnx-bbram: hw/nvram: Fix uninitialized Error *

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