Merge branch 'scsi-fixes' into merge-base
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 20 May 2009 22:20:44 +0000 (17:20 -0500)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 20 May 2009 22:20:44 +0000 (17:20 -0500)

Trivial merge