Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 24 Nov 2015 16:50:27 +0000 (16:50 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 24 Nov 2015 16:50:27 +0000 (16:50 +0000)

Trivial merge