mirror of
https://github.com/qemu/qemu.git
synced 2024-12-23 12:13:32 +08:00
673652a785
This merge fixes a semantic conflict with the trivial tree. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
||
---|---|---|
.. | ||
aspeed_rtc.h | ||
m48t59.h | ||
mc146818rtc_regs.h | ||
mc146818rtc.h | ||
pl031.h | ||
sun4v-rtc.h | ||
xlnx-zynqmp-rtc.h |