From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Sat, 16 Dec 2006 21:23:45 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v2.6.20-rc2~122
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c7ef259bfb4084d8806dfff9eb8bfc6e82bb8c45;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: Use DEFINE_MUTEX() instead of mutex_init()
  IB/mthca: Add HCA profile module parameters
  IB/srp: Fix FMR mapping for 32-bit kernels and addresses above 4G
  IB: Fix ib_dma_alloc_coherent() wrapper
---

c7ef259bfb4084d8806dfff9eb8bfc6e82bb8c45