| commit | 84d891d6727c17832c79ec96d3d107a87d857978 | |
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | |
| Fri, 14 Apr 2006 20:47:45 +0000 (14 15:47 -0500) | ||
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | |
| Fri, 14 Apr 2006 20:47:45 +0000 (14 15:47 -0500) | ||
| tree | a189a4d00c1387e409e2f9808c72c8088728c33b | treesnapshot (tar.gz zip) |
| parent | 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 | commitdiff |
| parent | 7676f83aeb774e7a3abe6af06ec92b29488b5b79 | commitdiff |
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>
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 | diff1 | diff2 | blobhistory |
| drivers/scsi/scsi_devinfo.c | diff1 | diff2 | blobhistory |
| drivers/scsi/scsi_scan.c | diff1 | diff2 | blobhistory |
| include/scsi/scsi_devinfo.h | diff1 | diff2 | blobhistory |