]> 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>
Tue, 10 Jun 2014 15:04:12 +0000 (16:04 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 10 Jun 2014 15:04:12 +0000 (16:04 +0100)

Trivial merge