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.c

…

ds1338.c

…

exynos4210_rtc.c

…

Kconfig

…

m41t80.c

…

m48t59-internal.h

…

m48t59-isa.c

…

m48t59.c

…

Makefile.objs

…

mc146818rtc.c

…

pl031.c

…

sun4v-rtc.c

…

trace-events

…

twl92230.c

…

xlnx-zynqmp-rtc.c

…