CVSROOT: /home/cvs/parisc Module name: linux Changes by: jsm 01/07/06 02:50:47 Modified files: drivers/scsi : ncr53c8xx.c sym53c8xx.c sym53c8xx_comm.h sym53c8xx_defs.h Log message: First pass at resolving 2.4.6 merge conflicts