]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
Merge remote-tracking branch 'xen-staging/master' into xen-for-4.5-temp
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 3 Jun 2014 17:52:59 +0000 (17:52 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 3 Jun 2014 17:52:59 +0000 (17:52 +0000)

Trivial merge