673652a785
This merge fixes a semantic conflict with the trivial tree. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
||
|---|---|---|
| .. | ||
| 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 | ||