Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Fri, 3 Jul 2015 15:33:45 +0000 (16:33 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 3 Jul 2015 15:33:45 +0000 (16:33 +0100)

Trivial merge