bad merge resolution in hw/escc.c
[qemu/aliguori.git] / roms / 
tree78adb664d3ea82f1a4dd5ec239887ac5b0168a7f
drwxr-xr-x   ..
m--------- - SLOF
m--------- - ipxe
m--------- - seabios
m--------- - vgabios