Merge /spare/repo/linux-2.6/

author Jeff Garzik <[email protected]>

Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)

committer Jeff Garzik <[email protected]>

Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
author Jeff Garzik <[email protected]>
Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
committer Jeff Garzik <[email protected]>
Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
diff --cc drivers/scsi/libata-scsi.c
Simple merge
diff --cc include/scsi/scsi.h
Simple merge
author	Jeff Garzik <[email protected]>
	Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
committer	Jeff Garzik <[email protected]>
	Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
		1	2
drivers/scsi/libata-scsi.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi.h	patch \|	diff1 \|	diff2 \|	blob \| history