]> 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>
Sun, 16 Aug 2015 08:00:30 +0000 (09:00 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Sun, 16 Aug 2015 08:00:30 +0000 (09:00 +0100)

Trivial merge