]> git.baikalelectronics.ru Git - kernel.git/commit
merge by hand (fix up qla_os.c merge error)
authorJames Bottomley <jejb@titanic.(none)>
Fri, 17 Jun 2005 23:42:23 +0000 (18:42 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Fri, 17 Jun 2005 23:42:23 +0000 (18:42 -0500)
commit767ba63bd661de7ff6940189eebfd55b59f21941
tree4c94e70ab846ffcb8bb5715fb3c8d8473358a323
parentc7e0233372ee8364ea1dc9cc69a5cb5d7f4ee1de
parent8ba917d4ab7ef88a0103d7aa5847d1dd5e5cf25a
merge by hand (fix up qla_os.c merge error)
drivers/block/elevator.c
drivers/ieee1394/sbp2.c
drivers/scsi/Kconfig
drivers/scsi/aic7xxx/aic79xx_osm.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/scsi_scan.c