tree a189a4d00c1387e409e2f9808c72c8088728c33b
parent 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055
parent 7676f83aeb774e7a3abe6af06ec92b29488b5b79
author James Bottomley <jejb@mulgrave.il.steeleye.com> 1145047665 -0500
committer James Bottomley <jejb@mulgrave.il.steeleye.com> 1145047665 -0500

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>