Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Wed, 13 May 2015 14:46:54 +0000 (15:46 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 13 May 2015 14:46:54 +0000 (15:46 +0100)

Trivial merge