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
..
2018-09-25 15:50:15 +02:00
2019-10-24 19:26:05 +02:00
2018-10-02 18:47:55 +02:00
2019-08-16 13:31:52 +02:00
2019-10-17 17:02:32 -04:00
2019-09-11 08:46:17 +02:00
2019-08-21 16:29:57 +02:00
2019-02-07 15:49:08 +02:00
2016-02-04 17:01:04 +00:00
2018-12-20 10:29:08 +01:00
2016-02-04 17:01:04 +00:00
2019-09-16 17:13:06 +02:00
2018-08-24 20:26:37 +02:00
2018-06-29 12:32:10 +02:00