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>

diff --cc drivers/scsi/Makefile
Simple merge

diff --cc drivers/scsi/scsi_devinfo.c
Simple merge

diff --cc drivers/scsi/scsi_scan.c
Simple merge

diff --cc include/scsi/scsi_devinfo.h
index 599966898208a489ef9014d0cc869def7f8b772b,d31b16d25a09f0c0980f7ce824a890a70c86f605..b4ddd3b18b4c1619fb7c7d9b4c484ed0bca89b2b
--- 1/include/scsi/scsi_devinfo.h
--- 2/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@@ -28,5 -28,5 +28,6 @@@
  #define BLIST_NO_ULD_ATTACH   0x100000 /* device is actually for RAID config */
  #define BLIST_SELECT_NO_ATN   0x200000 /* select without ATN */
  #define BLIST_RETRY_HWERROR   0x400000 /* retry HARDWARE_ERROR */
- #define BLIST_ATTACH_PQ3      0x800000 /* Scan: Attach to PQ3 devices */
+ #define BLIST_MAX_512         0x800000 /* maximum 512 sector cdb length */
++#define BLIST_ATTACH_PQ3      0x1000000 /* Scan: Attach to PQ3 devices */
  #endif