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

hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory

2019-10-24 20:31:44 +02:00

ds1338.c

hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory

2019-10-24 20:26:35 +02:00

exynos4210_rtc.c

hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory

2019-10-24 20:29:18 +02:00

Kconfig

hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory

2019-10-24 20:26:35 +02:00

m41t80.c

…

m48t59-internal.h

…

m48t59-isa.c

…

m48t59.c

…

Makefile.objs

hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory

2019-10-24 20:31:44 +02:00

mc146818rtc.c

Merge commit 'df84f17' into HEAD

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

pl031.c

…

sun4v-rtc.c

…

trace-events

hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory

2019-10-24 20:31:44 +02:00

twl92230.c

…

xlnx-zynqmp-rtc.c

hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include

2019-10-24 20:34:12 +02:00