Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Fri, 29 May 2015 12:22:31 +0000 (13:22 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 29 May 2015 12:22:31 +0000 (13:22 +0100)

Trivial merge