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)
commitefa6e7e9d40fe01406d889a5bed62f2e0da49bff
tree7f856e4c4264a2e51768610f4b883ef023152f27
parent5006ecc2d5073d4e52f54381fd0fee1575d4ce22
parentaee10a03eb3e240bfd1a6f91e06ce82df47c5c58
Merge branch 'for-jeff' of git://htj.dyndns.org/libata-tj into tejun-merge
drivers/scsi/scsi_lib.c