Jeff Garzik f89b2b5ddc Merge branch 'upstream-fixes' into upstream ...

Conflicts:

	drivers/ata/ata_piix.c

2006-08-22 06:10:49 -04:00

..

ahci.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

ata_piix.c

Merge branch 'upstream-fixes' into upstream

2006-08-22 06:10:49 -04:00

Kconfig

libata: Make sure drivers/ata is a separate Kconfig menu

2006-08-14 14:27:36 -04:00

libata-bmdma.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

libata-core.c

[PATCH] libata: Add CompactFlash support

2006-08-14 14:04:37 -04:00

libata-eh.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

libata-scsi.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

libata.h

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

Makefile

libata: Separate libata.ko build from individual driver builds

2006-08-14 14:12:57 -04:00

pdc_adma.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_mv.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_nv.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_promise.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_promise.h

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_qstor.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_sil24.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_sil.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_sis.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_svw.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_sx4.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_uli.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_via.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00

sata_vsc.c

Move libata to drivers/ata.

2006-08-10 07:31:37 -04:00