tree 4c94e70ab846ffcb8bb5715fb3c8d8473358a323
parent 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab
parent df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0
author James Bottomley <jejb@titanic.(none)> 1119051743 -0500
committer James Bottomley <jejb@titanic.(none)> 1119051743 -0500

merge by hand (fix up qla_os.c merge error)