xenbits.xensource.com Git - qemu-xen.git/commit

]> xenbits.xensource.com Git - qemu-xen.git/commit

author	Paolo Bonzini <pbonzini@redhat.com>
	Sat, 26 Oct 2019 13:36:22 +0000 (15:36 +0200)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Sat, 26 Oct 2019 13:38:02 +0000 (15:38 +0200)
commit	673652a785efb5f7da342b49c80a1abf033c82a7
tree	2f277cce43b50e85cca36d7354ba2dd7ffd14d41	tree
parent	856bd2c28e108ad0eb909bbbf3774f6f8bd7c2d4	commit \| diff
parent	df84f17d1beabbb2aca39be18b21afc277cd6754	commit \| diff

Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

qemu-xen (upstream qemu) tree.