Anthony Liguori fdba9594df Merge remote-tracking branch 'mst/for_anthony' into staging ...

Conflicts:
	hw/usb-uhci.c

2011-06-22 07:11:09 -05:00

..

ahci.c

ahci: Fix non-NCQ accesses for LBA > 16bits

2011-05-19 12:08:28 +02:00

ahci.h

ich/ahci: convert to pci_register_bar_simple()

2011-04-07 13:56:46 +03:00

atapi.c

ide/atapi: fix set but unused

2011-05-03 11:29:21 +02:00

cmd646.c

hw/ide/cmd646.c: convert to PCIDeviceInfo to initialize ids

2011-06-12 10:33:35 +03:00

core.c

ide: add TRIM support

2011-06-15 14:36:16 +02:00

ich.c

Merge remote-tracking branch 'origin/master' into pci

2011-06-15 18:27:15 +03:00

internal.h

ide: add TRIM support

2011-06-15 14:36:16 +02:00

isa.c

Remove unused sysemu.h include directives

2011-04-15 18:25:41 +00:00

macio.c

ide: add TRIM support

2011-06-15 14:36:16 +02:00

microdrive.c

Remove unused sysemu.h include directives

2011-04-15 18:25:41 +00:00

mmio.c

Remove unused sysemu.h include directives

2011-04-15 18:25:41 +00:00

pci.c

ide: Clear error_status after restarting flush

2011-06-15 15:39:13 +02:00

pci.h

ide: Split error status from status register

2011-06-15 14:36:15 +02:00

piix.c

ide/piix: convert to PCIDeviceInfo to initialize ids

2011-06-12 10:33:33 +03:00

qdev.c

ide: add TRIM support

2011-06-15 14:36:16 +02:00

via.c

hw/ide/via.c: convert to PCIDeviceInfo to initialize ids

2011-06-12 10:33:35 +03:00