OSDN Git Service

(root) / qmiga / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 856bd2c df84f17)
Merge commit 'df84f17' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Sat, 26 Oct 2019 13:36:22 +0000 (15:36 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Sat, 26 Oct 2019 13:38:02 +0000 (15:38 +0200)
commit673652a785efb5f7da342b49c80a1abf033c82a7
tree2f277cce43b50e85cca36d7354ba2dd7ffd14d41tree | snapshot
parent856bd2c28e108ad0eb909bbbf3774f6f8bd7c2d4commit | diff
parentdf84f17d1beabbb2aca39be18b21afc277cd6754commit | diff
Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
MAINTAINERS diff1 | diff2 | blob | history
hw/i386/acpi-build.c diff1 | diff2 | blob | history
hw/i386/microvm.c | diff2 | blob | history
hw/i386/pc.c diff1 | diff2 | blob | history
hw/i386/pc_q35.c diff1 | diff2 | blob | history
hw/rtc/mc146818rtc.c diff1 | diff2 | blob | history
include/hw/rtc/mc146818rtc.h diff1 | diff2 | blob | history
include/hw/rtc/mc146818rtc_regs.h diff1 | diff2 | blob | history
target/i386/cpu.c diff1 | diff2 | blob | history
tests/rtc-test.c diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help