From: James Bottomley <jejb@titanic.(none)>
Date: Fri, 17 Jun 2005 23:42:23 +0000 (-0500)
Subject: merge by hand (fix up qla_os.c merge error)
X-Git-Tag: v2.6.14-rc2~49^2~36^2~56^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3237ee78fc00f786d5f5aec6f9310b0e39069f15;p=pandora-kernel.git

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

3237ee78fc00f786d5f5aec6f9310b0e39069f15
Reading git-diff-tree failed