From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 29 Aug 2005 17:36:48 +0000 (-0700)
Subject: Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
X-Git-Tag: v2.6.14-rc1~1050
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a78b3371b628559eb5c46ee1518df27c62f3e801;p=linux-2.6-omap-h63xx.git

Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
---

a78b3371b628559eb5c46ee1518df27c62f3e801