diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-30 17:27:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-30 17:27:54 +0100 |
| commit | 7aefc145659f1586c2f060c1ded5ec0c5c3f08dd (patch) | |
| tree | 58a73414cf1cbaaac6f21461526502ed23382f42 /hw/misc/macio/cuda.c | |
| parent | 6d9dd5fb9d0e9f4a174f53a0e20a39fbe809c71e (diff) | |
| parent | 0261fb805c00a6f97d143235e7b06b0906bdf898 (diff) | |
| download | focaccia-qemu-7aefc145659f1586c2f060c1ded5ec0c5c3f08dd.tar.gz focaccia-qemu-7aefc145659f1586c2f060c1ded5ec0c5c3f08dd.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180730' into staging
target-arm queue: * arm/smmuv3: Fix broken VM state migration * armv7m_nvic: Fix broken VM state migration * hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host() * hw/arm/iotkit: Fix IRQ number for timer1 * hw/misc/tz-mpc: Zero the LUT on initialization, not just reset * target/arm: Remove duplicate 'host' entry in '-cpu ?' output # gpg: Signature made Mon 30 Jul 2018 15:16:01 BST # gpg: using RSA key 3C2525ED14360CDE # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" # gpg: aka "Peter Maydell <pmaydell@gmail.com>" # gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE * remotes/pmaydell/tags/pull-target-arm-20180730: target/arm: Remove duplicate 'host' entry in '-cpu ?' output hw/misc/tz-mpc: Zero the LUT on initialization, not just reset hw/arm/iotkit: Fix IRQ number for timer1 armv7m_nvic: Fix m-security subsection name hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host() arm/smmuv3: Fix missing VMSD terminator Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/macio/cuda.c')
0 files changed, 0 insertions, 0 deletions