From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 16 May 2005 17:34:52 +0000 (-0700)
Subject: Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
X-Git-Tag: v2.6.12-rc5~176
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=768cbfbc5273bad91afe12b81471f563b288118a;p=~emulex%2Finfiniband.git

Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git
---

768cbfbc5273bad91afe12b81471f563b288118a