Automatic merge of ../scsi-misc-2.6-old/
authorJames Bottomley <jejb@mulgrave.(none)>
Thu, 26 May 2005 18:14:55 +0000 (14:14 -0400)
committerJames Bottomley <jejb@mulgrave.(none)>
Thu, 26 May 2005 18:14:55 +0000 (14:14 -0400)

Trivial merge