]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/xen.git/commitdiff
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Fri, 5 Jun 2015 13:35:49 +0000 (14:35 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 5 Jun 2015 13:35:49 +0000 (14:35 +0100)

Trivial merge