From: James Bottomley <jejb@titanic.(none)>
Date: Sat, 18 Jun 2005 00:04:18 +0000 (-0500)
Subject: merge by hand (qla_os.c mismerge)
X-Git-Tag: firefly_0821_release~40856^2~21^2~234
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3afa294c40013be5d8180005002e3f648d04d942;p=firefly-linux-kernel-4.4.55.git

merge by hand (qla_os.c mismerge)
---

3afa294c40013be5d8180005002e3f648d04d942