Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2016-04-20' into staging
commitfa59dd95829bc33d591274e98db5bb762ba1a2a0
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 20 Apr 2016 15:16:55 +0000 (20 16:16 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 20 Apr 2016 15:16:55 +0000 (20 16:16 +0100)
tree14bbbd1d70172c7134942c01d20162bff8f14350
parent4113b0532da6c448f8e458b413ebde035234d0ea
parent4df26e88ee2f23c01418630368e87b719ed06b75
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2016-04-20' into staging

Xen 2016/04/20

# gpg: Signature made Wed 20 Apr 2016 12:08:56 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/xen-2016-04-20:
  xenfb: use the correct condition to avoid excessive looping

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>