]> 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>
Wed, 4 Nov 2015 09:38:51 +0000 (09:38 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 4 Nov 2015 09:38:51 +0000 (09:38 +0000)

Trivial merge