diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 17:28:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 17:28:37 +0100 |
| commit | 42747d6abb5035473e5585fa17620c1e8983a70b (patch) | |
| tree | 0047976f8370bc9ec15d03ba71d0737fa512605b /migration/rdma.c | |
| parent | 4359255ad39fdf116f0cf70a77ef5330c217e4da (diff) | |
| parent | 462c254430b49ef708c75e038d7e796764058ca1 (diff) | |
| download | qemu-42747d6abb5035473e5585fa17620c1e8983a70b.zip qemu-42747d6abb5035473e5585fa17620c1e8983a70b.tar.gz qemu-42747d6abb5035473e5585fa17620c1e8983a70b.tar.bz2 | |
Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2018-06-15.for-upstream' into staging
xilinx-next-2018-06-15.for-upstream
# gpg: Signature made Fri 15 Jun 2018 15:32:47 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-06-15.for-upstream:
target-microblaze: Rework NOP/zero instruction handling
target-microblaze: mmu: Correct masking of output addresses
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/rdma.c')
0 files changed, 0 insertions, 0 deletions