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