]> nv-tegra.nvidia Code Review - linux-2.6.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)
commit3237ee78fc00f786d5f5aec6f9310b0e39069f15
tree4c94e70ab846ffcb8bb5715fb3c8d8473358a323
parent9ee1c939d1cb936b1f98e8d81aeffab57bae46ab
parentdf0ae2497ddefd72a87f3a3b34ff32455d7d4ae0
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