Merge HEAD from ../scsi-misc-2.6-old
authorJames Bottomley <jejb@mulgrave.(none)>
Fri, 28 Oct 2005 16:41:41 +0000 (11:41 -0500)
committerJames Bottomley <jejb@mulgrave.(none)>
Fri, 28 Oct 2005 16:41:41 +0000 (11:41 -0500)

Trivial merge