From: Peter Maydell Date: Wed, 20 Apr 2016 15:16:55 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2016-04-20' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fa59dd95829bc33d591274e98db5bb762ba1a2a0;p=qemu.git 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 " * remotes/sstabellini/tags/xen-2016-04-20: xenfb: use the correct condition to avoid excessive looping Signed-off-by: Peter Maydell --- fa59dd95829bc33d591274e98db5bb762ba1a2a0