Paolo Bonzini 673652a785 Merge commit 'df84f17' into HEAD
This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2019-10-26 15:38:02 +02:00
..
2019-09-30 11:02:22 +01:00
2019-09-20 14:08:10 -05:00
2019-10-26 15:38:02 +02:00
2019-09-10 08:58:43 +02:00
2019-09-10 08:58:43 +02:00
2019-09-10 08:58:43 +02:00
2019-09-10 08:58:43 +02:00
2019-10-04 18:49:18 +02:00
2018-12-20 10:29:08 +01:00