Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 22:30:58 +0000 (18:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 22:30:58 +0000 (18:30 -0400)
commit77501f3cb648e18733509a951ed31eddd7ef2c0b
tree82624caa354394df2422562bf6dda56a2c088704
parent422fa08e538b649a9b80258950d2f8a202f45f19
parent59a10b172fccaea793352c00fd9065f0a5b4ef70
Merge branch 'upstream'
drivers/scsi/libata-scsi.c
drivers/scsi/libata.h