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-08-16 13:31:52 +02:00
2019-08-21 09:13:37 +02:00
2019-08-16 13:31:52 +02:00
2019-08-16 13:31:53 +02:00
2019-10-15 18:09:04 +01:00
2019-10-26 15:38:02 +02:00
2019-10-26 15:38:02 +02:00
2019-08-16 13:31:53 +02:00
2019-09-20 14:08:10 -05:00
2019-08-16 13:31:53 +02:00
2019-10-26 15:38:02 +02:00
2019-10-24 19:24:56 +02:00
2019-10-26 15:38:02 +02:00
2019-10-10 10:56:18 +02:00
2019-10-15 18:09:04 +01:00
2019-08-16 13:31:53 +02:00
2019-08-16 13:31:52 +02:00
2019-08-16 13:31:53 +02:00
2019-10-18 20:38:10 -07:00