Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Wed, 22 Jun 2005 17:10:49 +0000 (13:10 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 22 Jun 2005 17:10:49 +0000 (13:10 -0400)
commit80bd6d7f5e0d872a0f5a151473d2a39d95d210a8
treeb3a36048d6b7de88f7e906624ecb4b98816bb736
parent949d33e70f2c3e93bfe5265a50e40175b1ab1ec1
parent2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e
Merge /spare/repo/linux-2.6/
drivers/scsi/libata-scsi.c
drivers/scsi/libata.h
include/scsi/scsi.h