Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
1  2 
drivers/scsi/libata-scsi.c
include/scsi/scsi.h

Simple merge
Simple merge