diff options
| author | Peter Maydell | 2015-11-24 15:22:37 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-11-24 15:22:38 +0100 |
| commit | d9636b6c2b533ab43fad8c9f47633debeef94561 (patch) | |
| tree | b21a11aa3359041b2a637ac8bc709ea1b7970bff /hw/ide/atapi.c | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | target-arm/translate-a64.c: Correct unallocated checks for ldst_excl (diff) | |
| download | qemu-d9636b6c2b533ab43fad8c9f47633debeef94561.tar.gz qemu-d9636b6c2b533ab43fad8c9f47633debeef94561.tar.xz qemu-d9636b6c2b533ab43fad8c9f47633debeef94561.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151124' into staging
target-arm queue:
* fix minimum RAM check warning on xlnx-ep108
* remove unused define from aarch64-linux-user.mak config
* don't mask out bits [47:40] in ARMv8 LPAE descriptors
* correct unallocated instruction checks for ldst_excl
# gpg: Signature made Tue 24 Nov 2015 14:17:10 GMT 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-20151124:
target-arm/translate-a64.c: Correct unallocated checks for ldst_excl
target-arm: Don't mask out bits [47:40] in LPAE descriptors for v8
default-configs/aarch64-linux-user.mak: Remove unused define
xlnx-ep108: Fix minimum RAM check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/atapi.c')
0 files changed, 0 insertions, 0 deletions