From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Fri, 14 Apr 2006 20:47:45 +0000 (-0500)
Subject: Merge ../scsi-rc-fixes-2.6
X-Git-Tag: v2.6.18-rc1~1092^2~78
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84d891d6727c17832c79ec96d3d107a87d857978;p=pandora-kernel.git

Merge ../scsi-rc-fixes-2.6

Conflicts:

	include/scsi/scsi_devinfo.h

Same number for two BLIST flags:  BLIST_MAX_512 and BLIST_ATTACH_PQ3

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

84d891d6727c17832c79ec96d3d107a87d857978
Reading git-diff-tree failed