Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 16:44:17 +0000 (11:44 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 16:44:17 +0000 (11:44 -0500)
commitf333b3f111e9db76109e304df8ee777ace7fbf86
treece9a74a7327020c48c80d278e1db5f12552f0fb0
parentf4256e301d9800b1e0276404cb01b3ac85b51067
parent79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.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