From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 22 Jul 2015 14:55:14 +0000 (+0100)
Subject: Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ce6ce4a8a88fa7930838fc9fa06300bc43713671;p=people%2Fliuw%2Flibxenctrl-split%2Fxen.git

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

ce6ce4a8a88fa7930838fc9fa06300bc43713671