Merge ../scsi-rc-fixes-2.6
commit84d891d6727c17832c79ec96d3d107a87d857978
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Fri, 14 Apr 2006 20:47:45 +0000 (14 15:47 -0500)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Fri, 14 Apr 2006 20:47:45 +0000 (14 15:47 -0500)
treea189a4d00c1387e409e2f9808c72c8088728c33b
parent5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055
parent7676f83aeb774e7a3abe6af06ec92b29488b5b79
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>
drivers/scsi/Makefile
drivers/scsi/scsi_devinfo.c
drivers/scsi/scsi_scan.c
include/scsi/scsi_devinfo.h