From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 15 Jun 2018 16:28:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2018-06-15.for... 
X-Git-Tag: qemu-xen-4.12.0-rc1~161
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=42747d6abb5035473e5585fa17620c1e8983a70b;p=qemu-xen.git

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>
---

42747d6abb5035473e5585fa17620c1e8983a70b