Merge branch 'linus'
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 31 Jan 2007 17:24:00 +0000 (11:24 -0600)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 31 Jan 2007 17:24:00 +0000 (11:24 -0600)
1  2 
drivers/scsi/Kconfig
drivers/scsi/aacraid/linit.c
drivers/scsi/qla2xxx/qla_def.h
drivers/scsi/qla2xxx/qla_gbl.h
drivers/scsi/qla2xxx/qla_init.c
drivers/scsi/qla2xxx/qla_isr.c
drivers/scsi/qla2xxx/qla_mbx.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/scsi_scan.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge