diff options
| author | Paolo Bonzini | 2019-10-26 15:36:22 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-10-26 15:38:02 +0200 |
| commit | 673652a785efb5f7da342b49c80a1abf033c82a7 (patch) | |
| tree | 2f277cce43b50e85cca36d7354ba2dd7ffd14d41 /pc-bios | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | mc146818rtc: always register rtc to rtc list (diff) | |
| download | qemu-673652a785efb5f7da342b49c80a1abf033c82a7.tar.gz qemu-673652a785efb5f7da342b49c80a1abf033c82a7.tar.xz qemu-673652a785efb5f7da342b49c80a1abf033c82a7.zip | |
Merge commit 'df84f17' into HEAD
This merge fixes a semantic conflict with the trivial tree.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/bios-microvm.bin | bin | 0 -> 65536 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/bios-microvm.bin b/pc-bios/bios-microvm.bin Binary files differnew file mode 100644 index 0000000000..45eabc5166 --- /dev/null +++ b/pc-bios/bios-microvm.bin |