Michael S. Tsirkin c924f36a30 Merge remote branch 'origin/master' into pci ...

Conflicts:
	Makefile.objs
	hw/virtio.c

2010-12-01 07:11:51 +02:00

..

cmd646.c

ide: convert bmdma address ioport to ioport_register()

2010-11-24 17:31:06 +01:00

core.c

ide: Set bus master inactive on error

2010-11-29 16:15:01 +01:00

internal.h

ide: convert bmdma address ioport to ioport_register()

2010-11-24 17:31:06 +01:00

isa.c

…

macio.c

…

microdrive.c

…

mmio.c

…

pci.c

ide: Reset current_addr after stopping DMA

2010-11-29 16:15:04 +01:00

pci.h

ide: convert bmdma address ioport to ioport_register()

2010-11-24 17:31:06 +01:00

piix.c

ide: convert bmdma address ioport to ioport_register()

2010-11-24 17:31:06 +01:00

qdev.c

…

via.c

Merge remote branch 'origin/master' into pci

2010-12-01 07:11:51 +02:00