Merge ../scsi-rc-fixes-2.6
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 22 Nov 2006 18:06:44 +0000 (12:06 -0600)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 22 Nov 2006 18:06:44 +0000 (12:06 -0600)

Trivial merge