This merge fixes a semantic conflict with the trivial tree. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile.objs | ||
aspeed_rtc.c | ||
ds1338.c | ||
exynos4210_rtc.c | ||
m41t80.c | ||
m48t59-internal.h | ||
m48t59-isa.c | ||
m48t59.c | ||
mc146818rtc.c | ||
pl031.c | ||
sun4v-rtc.c | ||
trace-events | ||
twl92230.c | ||
xlnx-zynqmp-rtc.c |