From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 11 Mar 2015 13:12:25 +0000 (+0000)
Subject: Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
X-Git-Tag: 4.6.0-rc1~993
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=636306f825ca2356762c4494526667b7da7a3dfd;p=xen.git

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

636306f825ca2356762c4494526667b7da7a3dfd