From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 8 Nov 2005 18:23:00 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.15-rc1~405
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a52e8381c430896d3bd6065a34fda99cb5c74c82;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
---

a52e8381c430896d3bd6065a34fda99cb5c74c82