Home
last modified time | relevance | path

Searched hist:"673652 a785efb5f7da342b49c80a1abf033c82a7" (Results 1 – 25 of 35) sorted by relevance

12

/openbmc/qemu/po/
H A Dbg.podiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/include/hw/rtc/
H A Dmc146818rtc_regs.hdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
H A Dmc146818rtc.hdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/util/
H A Dsystemd.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
H A Dmain-loop.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/include/hw/virtio/
H A Dvirtio-mmio.hdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/pc-bios/
HDbios-microvm.bindiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/include/hw/i386/
H A Dmicrovm.hdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
H A Dx86.hdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/hw/acpi/
H A Dcpu_hotplug.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/hw/rtc/
H A Dmc146818rtc.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/include/hw/nvram/
H A Dfw_cfg.hdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/
H A D.gitmodulesdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/roms/
H A DMakefilediff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/hw/intc/
H A Dapic.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
H A Dioapic.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/hw/i386/
H A DKconfigdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
H A Dpc_sysfw.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
H A Dmicrovm.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
H A Damd_iommu.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
H A Dx86.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/target/i386/
H A Dmachine.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/hw/virtio/
H A Dvirtio-mmio.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/hw/i386/xen/
H A Dxen-hvm.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
/openbmc/qemu/hw/nvram/
H A Dfw_cfg.cdiff 673652a785efb5f7da342b49c80a1abf033c82a7 Sat Oct 26 08:36:22 CDT 2019 Paolo Bonzini <pbonzini@redhat.com> Merge commit 'df84f17' into HEAD

This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

12