From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Thu, 10 Oct 2013 11:02:48 +0000 (+0000)
Subject: Merge remote branch 'origin/stable-1.6' into xen-staging-master-9
X-Git-Tag: qemu-xen-4.4.0-rc1~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d84e4524e30413b2a1d724754e76a7d2480466f3;p=qemu-upstream-4.4-testing.git

Merge remote branch 'origin/stable-1.6' into xen-staging-master-9

Conflicts:
	xen-all.c
---

d84e4524e30413b2a1d724754e76a7d2480466f3