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

Conflicts:
	exec.c

2011-05-05 16:39:47 +03:00

..

ahci.c

ich/ahci: convert to pci_register_bar_simple()

2011-04-07 13:56:46 +03: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

ide: Fix build for cmd646.c

2010-12-17 19:57:21 +01:00

core.c

ide: Split atapi.c out

2011-04-27 16:20:27 +02:00

ich.c

Merge remote branch 'origin/master' into pci

2011-05-05 16:39:47 +03:00

internal.h

ide: Split atapi.c out

2011-04-27 16:20:27 +02:00

isa.c

Remove unused sysemu.h include directives

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

macio.c

Remove unused sysemu.h include directives

2011-04-15 18:25:41 +00: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

Remove unused sysemu.h include directives

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

pci.h

ide: Split out BMDMA code from ATA core

2010-12-17 16:11:01 +01:00

piix.c

isa-bus: Remove bogus IRQ sharing check

2011-02-21 15:46:53 +01:00

qdev.c

Add bootindex parameter to net/block/fd device

2010-12-11 21:32:46 +00:00

via.c

isa-bus: Remove bogus IRQ sharing check

2011-02-21 15:46:53 +01:00