Conflicts: Makefile.objs hw/virtio.c |
||
|---|---|---|
| .. | ||
| cmd646.c | ||
| core.c | ||
| internal.h | ||
| isa.c | ||
| macio.c | ||
| microdrive.c | ||
| mmio.c | ||
| pci.c | ||
| pci.h | ||
| piix.c | ||
| qdev.c | ||
| via.c | ||
Conflicts: Makefile.objs hw/virtio.c |
||
|---|---|---|
| .. | ||
| cmd646.c | ||
| core.c | ||
| internal.h | ||
| isa.c | ||
| macio.c | ||
| microdrive.c | ||
| mmio.c | ||
| pci.c | ||
| pci.h | ||
| piix.c | ||
| qdev.c | ||
| via.c | ||