Merge HEAD from ../scsi-iscsi-2.6
authorJames Bottomley <jejb@titanic.(none)>
Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)

Trivial merge