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

..

aspeed_rtc.h

…

m48t59.h

…

mc146818rtc_regs.h

Merge commit 'df84f17' into HEAD

2019-10-26 15:38:02 +02:00

mc146818rtc.h

Merge commit 'df84f17' into HEAD

2019-10-26 15:38:02 +02:00

pl031.h

…

sun4v-rtc.h

…

xlnx-zynqmp-rtc.h

…