Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:52:42 +0000 (21:52 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:52:42 +0000 (21:52 -0400)
commitb194b4250c2b7e9d762823ac6045316fcd4bf4f9
tree8c54b5004822958ef0a7603e76a4868582e26d7f
parentc4052da6f0c01a0b059d125d72bb934d0980b798
parent59a10b172fccaea793352c00fd9065f0a5b4ef70
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/libata.h