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)
commit30716e07ef511ec7525c07eb1e8060ba8943c2a2
treeeb6a47cae63d3587fa773cc5a16781eaa2c7810b
parent03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c
parentf56df2f4db6e4af87fb8e941cff69f4501a111df
Merge branch 'linus'
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