From: James Bottomley <jejb@mulgrave.(none)>
Date: Sat, 29 Oct 2005 14:42:17 +0000 (-0500)
Subject: [SCSI] fix up mismerge in osst
X-Git-Tag: v2.6.15-rc1~723^2~2^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e23babfcf21a2dc726d3be00e06993f02f0274;p=pandora-kernel.git

[SCSI] fix up mismerge in osst

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

Reading git-diff-tree failed