From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 19 Mar 2015 11:03:41 +0000 (+0000)
Subject: Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
X-Git-Tag: 4.6.0-rc1~930
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6c0c7500d8d22f098db8d440777ecf7a773a040f;p=xen.git

Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
---

6c0c7500d8d22f098db8d440777ecf7a773a040f