]> xenbits.xensource.com Git - xen.git/commitdiff
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Thu, 25 Sep 2014 12:43:41 +0000 (13:43 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Thu, 25 Sep 2014 12:43:41 +0000 (13:43 +0100)

Trivial merge