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

Trivial merge