From: Linus Torvalds Date: Thu, 17 Nov 2005 18:56:34 +0000 (-0800) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: v2.6.15-rc2~65 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7652aab77fbf6de8bcc69ee6a864270b0da6b3f6;p=~emulex%2Finfiniband.git Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus --- 7652aab77fbf6de8bcc69ee6a864270b0da6b3f6