From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Wed, 11 Mar 2015 11:16:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master
X-Git-Tag: qemu-xen-4.6.0-rc1~34
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=42ffdf360dd9df66b0a4a7ada059c02a3cf3a8de;p=qemu-upstream-unstable.git

Merge remote-tracking branch 'origin/stable-2.2' into xen-staging/master
---

42ffdf360dd9df66b0a4a7ada059c02a3cf3a8de