Jeff Garzik 029f5468b5 Merge branch 'upstream'
Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/pdc_adma.c
	drivers/scsi/sata_mv.c
	drivers/scsi/sata_nv.c
	drivers/scsi/sata_promise.c
	drivers/scsi/sata_qstor.c
	drivers/scsi/sata_sx4.c
	drivers/scsi/sata_vsc.c
	include/linux/libata.h
2006-04-02 10:30:40 -04:00
..
2006-03-31 12:19:01 -08:00
2006-03-31 12:18:55 -08:00
2006-03-27 08:44:48 -08:00
2006-03-28 09:16:08 -08:00
2006-03-27 08:44:48 -08:00
2006-03-31 12:18:55 -08:00
2006-04-02 10:30:40 -04:00
2006-03-25 08:22:52 -08:00