]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
Merge remote-tracking branch 'xen-staging/master' into temp2
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 16 Jan 2015 15:20:40 +0000 (15:20 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 16 Jan 2015 15:20:40 +0000 (15:20 +0000)

Trivial merge