From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 19 Nov 2005 23:24:42 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
X-Git-Tag: v2.6.15-rc2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3b762d321a5e73d3a892a13f0c84dc1d3d50e928;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

Manual fixups to ARM ixp4xxx by hand.
---

3b762d321a5e73d3a892a13f0c84dc1d3d50e928