diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-30 16:12:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-30 16:12:00 +0100 |
| commit | e0eff721e186d48dc4890414cfe117a61c103804 (patch) | |
| tree | 5d968bbfd809d5a5296a5b9731bcd1bc9a39f3cc /tests/qapi-schema/include-nested-err.err | |
| parent | c2c768500f17fc8cdcfa44d169f089953bb22748 (diff) | |
| parent | fce6a8eceb07e27f0cdea87427f4e560dfa0b1c8 (diff) | |
| download | qemu-e0eff721e186d48dc4890414cfe117a61c103804.zip qemu-e0eff721e186d48dc4890414cfe117a61c103804.tar.gz qemu-e0eff721e186d48dc4890414cfe117a61c103804.tar.bz2 | |
Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2018-04-30.for-upstream' into staging
edgar/xilinx-next-2018-01.for-upstream
# gpg: Signature made Mon 30 Apr 2018 15:52:35 BST
# gpg: using RSA key 29C596780F6BCA83
# gpg: Good signature from "Edgar E. Iglesias (Xilinx key) <edgar.iglesias@xilinx.com>"
# gpg: aka "Edgar E. Iglesias <edgar.iglesias@gmail.com>"
# Primary key fingerprint: AC44 FEDC 14F7 F1EB EDBF 4151 29C5 9678 0F6B CA83
* remotes/edgar/tags/edgar/xilinx-next-2018-04-30.for-upstream:
target-microblaze: mmu: Make the TLBX MISS bit read-only
target-microblaze: mmu: Make TLBSX write-only
target-microblaze: Don't clobber the IMM reg for ld/st reversed
target-microblaze: Fix trap checks for FPU insns
target-microblaze: Respect MSR.PVR as read-only
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qapi-schema/include-nested-err.err')
0 files changed, 0 insertions, 0 deletions