From: James Bottomley <jejb@titanic.(none)>
Date: Fri, 16 Dec 2005 02:17:02 +0000 (-0600)
Subject: Fix up SCSI mismerge
X-Git-Tag: v2.6.16-rc1~474^2~22^2~8^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b16318dea8d9840dac567a2ae8c50ecdea36aea;p=pandora-kernel.git

Fix up SCSI mismerge

I forgot to do a git-update-cache on the merged files ...
---

Reading git-diff-tree failed