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.13-rc1~90^2~583^2~62
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3afa294c40013be5d8180005002e3f648d04d942;p=pandora-kernel.git

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

3afa294c40013be5d8180005002e3f648d04d942
Reading git-diff-tree failed