diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-08 14:01:58 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-08 14:01:58 +0100 |
| commit | 67d01fb8066b7bfa9be1b2c8537ad3f2406d98cf (patch) | |
| tree | f8d1985530290f3dff6f03f5ff50db9bd41276bd /pc-bios/s390-ccw/main.c | |
| parent | eaa4980185943da6e36f6f2e052d41924705e1ea (diff) | |
| parent | 75c9a1a0473cc5ca9756d11b236c715c7bc0ba67 (diff) | |
| download | qemu-67d01fb8066b7bfa9be1b2c8537ad3f2406d98cf.zip qemu-67d01fb8066b7bfa9be1b2c8537ad3f2406d98cf.tar.gz qemu-67d01fb8066b7bfa9be1b2c8537ad3f2406d98cf.tar.bz2 | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140708' into staging
target-arm queue:
* fix handling of KVM reset for 32-bit ARM CPUs
* implement NOR flash alias for vexpress-a9
* make sure libvixl gets its own utils.h rather than somebody else's
# gpg: Signature made Tue 08 Jul 2014 13:12:05 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
* remotes/pmaydell/tags/pull-target-arm-20140708:
target-arm: Implement vCPU reset via KVM_ARM_VCPU_INIT for 32-bit CPUs
hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9
disas/libvixl: prepend the include path of libvixl header files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'pc-bios/s390-ccw/main.c')
0 files changed, 0 insertions, 0 deletions