tree aa910b2c8a8dd7f80b6fe13c9a206136ddc078fc
parent 99f5e9718185f07458ae70c2282c2153a2256c91
parent 0b0df6f2079e731c44226a0673b07a166509a5de
author Linus Torvalds <torvalds@woody.osdl.org> 1166304225 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1166304225 -0800

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