befeac45d4
Conflicts: hw/virtio-pci.c |
||
---|---|---|
.. | ||
ahci.c | ||
ahci.h | ||
atapi.c | ||
cmd646.c | ||
core.c | ||
ich.c | ||
internal.h | ||
isa.c | ||
macio.c | ||
microdrive.c | ||
mmio.c | ||
pci.c | ||
pci.h | ||
piix.c | ||
qdev.c | ||
via.c |
befeac45d4
Conflicts: hw/virtio-pci.c |
||
---|---|---|
.. | ||
ahci.c | ||
ahci.h | ||
atapi.c | ||
cmd646.c | ||
core.c | ||
ich.c | ||
internal.h | ||
isa.c | ||
macio.c | ||
microdrive.c | ||
mmio.c | ||
pci.c | ||
pci.h | ||
piix.c | ||
qdev.c | ||
via.c |