673652a785
This merge fixes a semantic conflict with the trivial tree. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
||
|---|---|---|
| .. | ||
| edk2@20d2e5a125 | ||
| ipxe@de4565cbe7 | ||
| openbios@f28e16f9aa | ||
| openhackware@c559da7c8e | ||
| opensbi@ce228ee091 | ||
| qboot@cb1c49e0cf | ||
| qemu-palcode@bf0e136988 | ||
| QemuMacDrivers@90c488d5f4 | ||
| seabios@a5cab58e9a | ||
| seabios-hppa@0f4fe84658 | ||
| sgabios@cbaee52287 | ||
| skiboot@3a6fdede6c | ||
| SLOF@899d988365 | ||
| u-boot@d3689267f9 | ||
| u-boot-sam460ex@60b3916f33 | ||
| config.seabios-128k | ||
| config.seabios-256k | ||
| config.vga-ati | ||
| config.vga-bochs-display | ||
| config.vga-cirrus | ||
| config.vga-isavga | ||
| config.vga-qxl | ||
| config.vga-ramfb | ||
| config.vga-stdvga | ||
| config.vga-virtio | ||
| config.vga-vmware | ||
| configure-seabios.sh | ||
| edk2-build.sh | ||
| edk2-funcs.sh | ||
| Makefile | ||
| Makefile.edk2 | ||