Anthony Liguori 8494a397b6 Merge remote-tracking branch 'kwolf/for-anthony' into staging ... Conflicts: block/vmdk.c		2011-10-31 11:09:00 -05:00
..
ahci.c	ahci: fix DPRINTF format strings	2011-10-26 14:22:40 +01:00
ahci.h	ahci: add port I/O index-data pair	2011-09-21 14:32:20 +02:00
atapi.c	atapi/scsi-disk: make mode page values coherent between the two	2011-10-28 19:25:50 +02:00
cmd646.c	hw: Trim superfluous #include "block_int.h"	2011-09-12 15:17:21 +02:00
core.c	atapi/scsi: unify definitions for MMC	2011-10-28 19:25:50 +02:00
ich.c	ahci: add port I/O index-data pair	2011-09-21 14:32:20 +02:00
internal.h	atapi/scsi: unify definitions for MMC	2011-10-28 19:25:50 +02:00
isa.c	ide: Convert to isa_register_portio_list	2011-10-11 15:57:11 +02:00
macio.c	atapi/scsi: unify definitions for MMC	2011-10-28 19:25:50 +02:00
microdrive.c	hw: Trim superfluous #include "block_int.h"	2011-09-12 15:17:21 +02:00
mmio.c	hw: Trim superfluous #include "block_int.h"	2011-09-12 15:17:21 +02:00
pci.c	Replace the VMSTOP macros with a proper state type	2011-09-15 16:39:32 -03:00
pci.h	ide: convert to memory API	2011-08-08 10:15:54 -05:00
piix.c	ide: Convert to isa_register_portio_list	2011-10-11 15:57:11 +02:00
qdev.c	Use glib memory allocation and free functions	2011-08-20 23:01:08 -05:00
via.c	ide: Convert to isa_register_portio_list	2011-10-11 15:57:11 +02:00