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)

Trivial merge