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: v2.6.14-rc2~49^2~36^2~56
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3afa294c40013be5d8180005002e3f648d04d942;p=linux-2.6-omap-h63xx.git

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

3afa294c40013be5d8180005002e3f648d04d942