Merge branch 'for-jeff' of git://htj.dyndns.org/libata-tj into tejun-merge
authorJeff Garzik <jeff@garzik.org>
Mon, 15 May 2006 15:26:53 +0000 (11:26 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 15 May 2006 15:26:53 +0000 (11:26 -0400)
1  2 
drivers/scsi/scsi_lib.c

Simple merge