diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-23 11:59:42 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-23 11:59:42 +0000 |
commit | fcb700b729892ddc6d0c16a6f88a95a333af3ca0 (patch) | |
tree | cc211c65f6a3f3373b167a3f4497546b33af7755 /qapi | |
parent | 9f33051abce238ab43a23125e237aac8b0931b88 (diff) | |
parent | 2867a96ffb63fa363820e4b0110b96a06218068b (diff) | |
download | qemu-fcb700b729892ddc6d0c16a6f88a95a333af3ca0.zip qemu-fcb700b729892ddc6d0c16a6f88a95a333af3ca0.tar.gz qemu-fcb700b729892ddc6d0c16a6f88a95a333af3ca0.tar.bz2 |
Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2019-01-22.for-upstream' into staging
Pullreq 2019-01-22
# gpg: Signature made Tue 22 Jan 2019 11:42:41 GMT
# 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-2019-01-22.for-upstream:
target/microblaze: Add props enabling exceptions on failed bus accesses
hw/microblaze: s3adsp1800: Create an unimplemented GPIO area
target/microblaze: Switch to transaction_failed hook
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
0 files changed, 0 insertions, 0 deletions