diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-04 17:43:39 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-04 17:43:39 +0100 |
| commit | 2e3a76ae3e47d502f9f0c4424b719945fba9d459 (patch) | |
| tree | 0bb315c6c4c906b40a2fc92b19a7bb760c39aa97 /hw/net/virtio-net.c | |
| parent | c40e13e106243a6798b7b02b4d7de5ff6c9be128 (diff) | |
| parent | bf06c1123a427fefc2cf9cf8019578eafc19eb6f (diff) | |
| download | focaccia-qemu-2e3a76ae3e47d502f9f0c4424b719945fba9d459.tar.gz focaccia-qemu-2e3a76ae3e47d502f9f0c4424b719945fba9d459.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160404' into staging
target-arm queue: * bcm2836: wire up CPU timer interrupts correctly * linux-user: ignore EXCP_YIELD in ARM cpu_loop() * target-arm: correctly reset SCTLR_EL3 * target-arm: remove incorrect ALIAS tags from ESR_EL2 and ESR_EL3 * target-arm: make the 64-bit version of VTCR do the migration # gpg: Signature made Mon 04 Apr 2016 17:42:16 BST using RSA key ID 14360CDE # 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>" * remotes/pmaydell/tags/pull-target-arm-20160404: target-arm: Make the 64-bit version of VTCR do the migration target-arm: Remove incorrect ALIAS tags from ESR_EL2 and ESR_EL3 target-arm: Correctly reset SCTLR_EL3 for 64-bit CPUs linux-user: arm: Handle (ignore) EXCP_YIELD in ARM cpu_loop() hw/arm/bcm2836: Wire up CPU timer interrupts correctly Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions